diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-23 23:21:55 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-23 23:21:55 (GMT) |
| commit | 0af0709b02899f9177db55eba7929e65e5834b29 (patch) | |
| tree | 96dd43de8d817d4cea7090c7daf548ebc9869237 /samples | |
| parent | 3c7868a9a8fab4fd9209bbd2d2f1ae269d063680 (diff) | |
| download | googletest-0af0709b02899f9177db55eba7929e65e5834b29.zip googletest-0af0709b02899f9177db55eba7929e65e5834b29.tar.gz googletest-0af0709b02899f9177db55eba7929e65e5834b29.tar.bz2 | |
Cleans up macro definitions.
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/sample6_unittest.cc | 4 | ||||
| -rw-r--r-- | samples/sample7_unittest.cc | 2 | ||||
| -rw-r--r-- | samples/sample8_unittest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/samples/sample6_unittest.cc b/samples/sample6_unittest.cc index 3616672..dd0df31 100644 --- a/samples/sample6_unittest.cc +++ b/samples/sample6_unittest.cc @@ -74,7 +74,7 @@ class PrimeTableTest : public testing::Test { PrimeTable* const table_; }; -#ifdef GTEST_HAS_TYPED_TEST +#if GTEST_HAS_TYPED_TEST using testing::Types; @@ -137,7 +137,7 @@ TYPED_TEST(PrimeTableTest, CanGetNextPrime) { #endif // GTEST_HAS_TYPED_TEST -#ifdef GTEST_HAS_TYPED_TEST_P +#if GTEST_HAS_TYPED_TEST_P using testing::Types; diff --git a/samples/sample7_unittest.cc b/samples/sample7_unittest.cc index 7f555c4..b5d507a 100644 --- a/samples/sample7_unittest.cc +++ b/samples/sample7_unittest.cc @@ -40,7 +40,7 @@ #include <gtest/gtest.h> -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST using ::testing::TestWithParam; using ::testing::Values; diff --git a/samples/sample8_unittest.cc b/samples/sample8_unittest.cc index 6a1b0c1..d76136a 100644 --- a/samples/sample8_unittest.cc +++ b/samples/sample8_unittest.cc @@ -38,7 +38,7 @@ #include <gtest/gtest.h> -#ifdef GTEST_HAS_COMBINE +#if GTEST_HAS_COMBINE // Suppose we want to introduce a new, improved implementation of PrimeTable // which combines speed of PrecalcPrimeTable and versatility of |