diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-06-18 18:44:25 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-06-18 18:44:25 +0000 |
| commit | 48568d0688d6e330ecf2efadd9d1539c349f6167 (patch) | |
| tree | ad1953f0c21fb1ccfd7c5f93f790b777067d79a1 /test/gtest_unittest.cc | |
| parent | c506784b08473f3ba8f37d588fd08d8d3f948245 (diff) | |
| download | googletest-48568d0688d6e330ecf2efadd9d1539c349f6167.tar.gz googletest-48568d0688d6e330ecf2efadd9d1539c349f6167.tar.bz2 googletest-48568d0688d6e330ecf2efadd9d1539c349f6167.zip | |
Fixes compatibility with C++11: (1 - 1) is no longer a NULL pointer constant.
Diffstat (limited to 'test/gtest_unittest.cc')
| -rw-r--r-- | test/gtest_unittest.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index 5aec883b..0cab07d1 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -512,15 +512,6 @@ TEST(NullLiteralTest, IsTrueForNullLiterals) { EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0)); EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0U)); EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0L)); - -# ifndef __BORLANDC__ - - // Some compilers may fail to detect some null pointer literals; - // as long as users of the framework don't use such literals, this - // is harmless. - EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(1 - 1)); - -# endif } // Tests that GTEST_IS_NULL_LITERAL_(x) is false when x is not a null |