Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
ad462b70
Commit
ad462b70
authored
Apr 09, 2021
by
Dino Radaković
Browse files
Merge pull request #3319 from a-sully:patch-1
PiperOrigin-RevId: 367509099
parents
6a5eb807
9c047902
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
googlemock/include/gmock/gmock-nice-strict.h
googlemock/include/gmock/gmock-nice-strict.h
+6
-6
No files found.
googlemock/include/gmock/gmock-nice-strict.h
View file @
ad462b70
...
...
@@ -141,8 +141,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS NiceMock
!
internal
::
HasStrictnessModifier
<
MockClass
>
(),
"Can't apply NiceMock to a class hierarchy that already has a "
"strictness modifier. See "
"https://github.com/google/googletest/blob/master/
googlemock/
docs/"
"cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"
);
"https://github.com/google/googletest/blob/master/docs/"
"
gmock_
cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"
);
NiceMock
()
:
MockClass
()
{
static_assert
(
sizeof
(
*
this
)
==
sizeof
(
MockClass
),
"The impl subclass shouldn't introduce any padding"
);
...
...
@@ -181,8 +181,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS NaggyMock
!
internal
::
HasStrictnessModifier
<
MockClass
>
(),
"Can't apply NaggyMock to a class hierarchy that already has a "
"strictness modifier. See "
"https://github.com/google/googletest/blob/master/
googlemock/
docs/"
"cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"
);
"https://github.com/google/googletest/blob/master/docs/"
"
gmock_
cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"
);
public:
NaggyMock
()
:
MockClass
()
{
...
...
@@ -224,8 +224,8 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock
!
internal
::
HasStrictnessModifier
<
MockClass
>
(),
"Can't apply StrictMock to a class hierarchy that already has a "
"strictness modifier. See "
"https://github.com/google/googletest/blob/master/
googlemock/
docs/"
"cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"
);
"https://github.com/google/googletest/blob/master/docs/"
"
gmock_
cook_book.md#the-nice-the-strict-and-the-naggy-nicestrictnaggy"
);
StrictMock
()
:
MockClass
()
{
static_assert
(
sizeof
(
*
this
)
==
sizeof
(
MockClass
),
"The impl subclass shouldn't introduce any padding"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment