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 | 270a551cb5a078909c1ec68eb2143cf7a2322e2c (patch) | |
| tree | ad1953f0c21fb1ccfd7c5f93f790b777067d79a1 /test | |
| parent | c567ac6c5431d9d2867ace1da1418f4575215516 (diff) | |
| download | gtest-270a551cb5a078909c1ec68eb2143cf7a2322e2c.tar.gz gtest-270a551cb5a078909c1ec68eb2143cf7a2322e2c.tar.bz2 gtest-270a551cb5a078909c1ec68eb2143cf7a2322e2c.tar.xz | |
Fixes compatibility with C++11: (1 - 1) is no longer a NULL pointer constant.
git-svn-id: http://googletest.googlecode.com/svn/trunk@655 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
| -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 5aec883..0cab07d 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 |