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 /src/gtest.cc | |
| 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 'src/gtest.cc')
| -rw-r--r-- | src/gtest.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index 57719aa..d6552f2 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -182,6 +182,10 @@ bool g_help_flag = false; } // namespace internal +static const char* GetDefaultFilter() { + return kUniversalFilter; +} + GTEST_DEFINE_bool_( also_run_disabled_tests, internal::BoolFromGTestEnv("also_run_disabled_tests", false), @@ -208,7 +212,7 @@ GTEST_DEFINE_string_( GTEST_DEFINE_string_( filter, - internal::StringFromGTestEnv("filter", kUniversalFilter), + internal::StringFromGTestEnv("filter", GetDefaultFilter()), "A colon-separated list of glob (not regex) patterns " "for filtering the tests to run, optionally followed by a " "'-' and a : separated list of negative patterns (tests to " |