eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes compatibility with C++11: (1 - 1) is no longer a NULL pointer constant.

Browse Source
This commit is contained in:
zhanyong.wan 2013-06-18 18:44:25 +00:00
parent c506784b08
commit 48568d0688
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtest.cc
View File

@ -182,6 +182,10 @@ bool g_help_flag = false;
} // namespace internal } // namespace internal
static const char* GetDefaultFilter() {
return kUniversalFilter;
}
GTEST_DEFINE_bool_( GTEST_DEFINE_bool_(
also_run_disabled_tests, also_run_disabled_tests,
internal::BoolFromGTestEnv("also_run_disabled_tests", false), internal::BoolFromGTestEnv("also_run_disabled_tests", false),
@ -208,7 +212,7 @@ GTEST_DEFINE_string_(
GTEST_DEFINE_string_( GTEST_DEFINE_string_(
filter, filter,
internal::StringFromGTestEnv("filter", kUniversalFilter), internal::StringFromGTestEnv("filter", GetDefaultFilter()),
"A colon-separated list of glob (not regex) patterns " "A colon-separated list of glob (not regex) patterns "
"for filtering the tests to run, optionally followed by a " "for filtering the tests to run, optionally followed by a "
"'-' and a : separated list of negative patterns (tests to " "'-' and a : separated list of negative patterns (tests to "

9
test/gtest_unittest.cc
View File

@ -512,15 +512,6 @@ TEST(NullLiteralTest, IsTrueForNullLiterals) {
EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0)); EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0));
EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0U)); EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0U));
EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0L)); 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 // Tests that GTEST_IS_NULL_LITERAL_(x) is false when x is not a null