diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-28 23:52:42 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-28 23:52:42 +0000 |
| commit | 74de57c951aedebc5dfe26a27604353432392b98 (patch) | |
| tree | 523c049421d656a498b3260de830c70b5e2070fe /include | |
| parent | 2733a36231e9e59dfe0648562ac021ccea0e27d8 (diff) | |
| download | gtest-74de57c951aedebc5dfe26a27604353432392b98.tar.gz gtest-74de57c951aedebc5dfe26a27604353432392b98.tar.bz2 gtest-74de57c951aedebc5dfe26a27604353432392b98.tar.xz | |
Fixes unused function warning on Mac, and fixes compatibility with newer GCC.gtest-embtk-1.1.0
git-svn-id: http://googletest.googlecode.com/svn/trunk@643 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index f78994a..dc4fe0c 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -813,8 +813,8 @@ struct CompileAssert { }; #define GTEST_COMPILE_ASSERT_(expr, msg) \ - typedef ::testing::internal::CompileAssert<(bool(expr))> \ - msg[bool(expr) ? 1 : -1] + typedef ::testing::internal::CompileAssert<(static_cast<bool>(expr))> \ + msg[static_cast<bool>(expr) ? 1 : -1] GTEST_ATTRIBUTE_UNUSED_ // Implementation details of GTEST_COMPILE_ASSERT_: // |