diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-01-29 06:49:00 (GMT) |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-01-29 06:49:00 (GMT) |
commit | 4b83461e9772cce62e84310060fe84172e9bf4ba (patch) | |
tree | 81c398e25c7db78187ecb3c6a756b9996140943b /include/gtest/internal | |
parent | c946ae60194727ede9d3ef44754839f48541a981 (diff) | |
download | googletest-4b83461e9772cce62e84310060fe84172e9bf4ba.zip googletest-4b83461e9772cce62e84310060fe84172e9bf4ba.tar.gz googletest-4b83461e9772cce62e84310060fe84172e9bf4ba.tar.bz2 |
Fixes some warnings when compiled with MSVC at warning level 4.
Diffstat (limited to 'include/gtest/internal')
-rw-r--r-- | include/gtest/internal/gtest-internal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index 37faaae..541c89b 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -748,6 +748,9 @@ String GetCurrentOsStackTraceExceptTop(UnitTest* unit_test, int skip_count); // Returns the number of failed test parts in the given test result object. int GetFailedPartCount(const TestResult* result); +// A helper for suppressing warnings on unreachable code in some macros. +inline bool True() { return true; } + } // namespace internal } // namespace testing @@ -835,7 +838,7 @@ int GetFailedPartCount(const TestResult* result); GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ if (const char* gtest_msg = "") { \ ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \ - { statement; } \ + if (::testing::internal::True()) { statement; } \ if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \ gtest_msg = "Expected: " #statement " doesn't generate new fatal " \ "failures in the current thread.\n" \ |