gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3319 from a-sully:patch-1

Browse Source 
PiperOrigin-RevId: 367509099
This commit is contained in:
Dino Radaković 2021-04-09 09:03:55 -07:00
commit ad462b70c9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
googlemock/include/gmock/gmock-nice-strict.h
View File

@ -141,8 +141,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS NiceMock
!internal::HasStrictnessModifier<MockClass>(), !internal::HasStrictnessModifier<MockClass>(),
"Can't apply NiceMock to a class hierarchy that already has a " "Can't apply NiceMock to a class hierarchy that already has a "
"strictness modifier. See " "strictness modifier. See "
"https://github.com/google/googletest/blob/master/googlemock/docs/" "https://github.com/google/googletest/blob/master/docs/"
"cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"); "gmock_cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy");
NiceMock() : MockClass() { NiceMock() : MockClass() {
static_assert(sizeof(*this) == sizeof(MockClass), static_assert(sizeof(*this) == sizeof(MockClass),
"The impl subclass shouldn't introduce any padding"); "The impl subclass shouldn't introduce any padding");
@ -181,8 +181,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS NaggyMock
!internal::HasStrictnessModifier<MockClass>(), !internal::HasStrictnessModifier<MockClass>(),
"Can't apply NaggyMock to a class hierarchy that already has a " "Can't apply NaggyMock to a class hierarchy that already has a "
"strictness modifier. See " "strictness modifier. See "
"https://github.com/google/googletest/blob/master/googlemock/docs/" "https://github.com/google/googletest/blob/master/docs/"
"cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"); "gmock_cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy");
public: public:
NaggyMock() : MockClass() { NaggyMock() : MockClass() {
@ -224,8 +224,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock
!internal::HasStrictnessModifier<MockClass>(), !internal::HasStrictnessModifier<MockClass>(),
"Can't apply StrictMock to a class hierarchy that already has a " "Can't apply StrictMock to a class hierarchy that already has a "
"strictness modifier. See " "strictness modifier. See "
"https://github.com/google/googletest/blob/master/googlemock/docs/" "https://github.com/google/googletest/blob/master/docs/"
"cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"); "gmock_cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy");
StrictMock() : MockClass() { StrictMock() : MockClass() {
static_assert(sizeof(*this) == sizeof(MockClass), static_assert(sizeof(*this) == sizeof(MockClass),
"The impl subclass shouldn't introduce any padding"); "The impl subclass shouldn't introduce any padding");