google/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-01 00:27:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleans up macro definitions.

Browse Source
This commit is contained in:
zhanyong.wan
2009-02-23 23:37:29 +00:00
parent 1bee7b2f1d
commit 652540a278
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/gmock/gmock-matchers.h
View File

@@ -1141,13 +1141,13 @@ class TrulyMatcher {
// interested in the address of the argument.
template <typename T>
bool Matches(T& x) const {
#ifdef GTEST_OS_WINDOWS
#if GTEST_OS_WINDOWS
// 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
return predicate_(x);
#ifdef GTEST_OS_WINDOWS
#if GTEST_OS_WINDOWS
#pragma warning(pop) // Restores the warning state.
#endif // GTEST_OS_WINDOWS
}