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
dd28d536
"googlemock/vscode:/vscode.git/clone" did not exist on "2bee6da24e9f63a22a4ed0f87e3db8583401fc68"
Commit
dd28d536
authored
Apr 14, 2011
by
vladlosev
Browse files
Updates conditional directives to be consistent with the rest of the project.
parent
e73cf452
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
include/gmock/gmock-matchers.h
include/gmock/gmock-matchers.h
+2
-2
No files found.
include/gmock/gmock-matchers.h
View file @
dd28d536
...
@@ -1392,13 +1392,13 @@ class TrulyMatcher {
...
@@ -1392,13 +1392,13 @@ class TrulyMatcher {
template
<
typename
T
>
template
<
typename
T
>
bool
MatchAndExplain
(
T
&
x
,
// NOLINT
bool
MatchAndExplain
(
T
&
x
,
// NOLINT
MatchResultListener
*
/* listener */
)
const
{
MatchResultListener
*
/* listener */
)
const
{
#if _MSC_VER
#if
def
_MSC_VER
// MSVC warns about converting a value into bool (warning 4800).
// MSVC warns about converting a value into bool (warning 4800).
# pragma warning(push) // Saves the current warning state.
# pragma warning(push) // Saves the current warning state.
# pragma warning(disable:4800) // Temporarily disables warning 4800.
# pragma warning(disable:4800) // Temporarily disables warning 4800.
#endif
#endif
return
predicate_
(
x
);
return
predicate_
(
x
);
#if _MSC_VER
#if
def
_MSC_VER
# pragma warning(pop) // Restores the warning state.
# pragma warning(pop) // Restores the warning state.
#endif
#endif
}
}
...
...
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