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
e73cf452
Commit
e73cf452
authored
Apr 13, 2011
by
vladlosev
Browse files
Corrects condition to compile out MSVC's pragmas. This fixes the build on MinGW.
parent
ab29bb6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
include/gmock/gmock-matchers.h
include/gmock/gmock-matchers.h
+4
-4
No files found.
include/gmock/gmock-matchers.h
View file @
e73cf452
...
...
@@ -1392,15 +1392,15 @@ class TrulyMatcher {
template
<
typename
T
>
bool
MatchAndExplain
(
T
&
x
,
// NOLINT
MatchResultListener
*
/* listener */
)
const
{
#if
GTEST_OS_WINDOWS
#if
_MSC_VER
// MSVC warns about converting a value into bool (warning 4800).
# pragma warning(push) // Saves the current warning state.
# pragma warning(disable:4800) // Temporarily disables warning 4800.
#endif
// GTEST_OS_WINDOWS
#endif
return
predicate_
(
x
);
#if
GTEST_OS_WINDOWS
#if
_MSC_VER
# pragma warning(pop) // Restores the warning state.
#endif
// GTEST_OS_WINDOWS
#endif
}
void
DescribeTo
(
::
std
::
ostream
*
os
)
const
{
...
...
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