diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-23 23:21:55 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-23 23:21:55 +0000 |
| commit | 0af0709b02899f9177db55eba7929e65e5834b29 (patch) | |
| tree | 96dd43de8d817d4cea7090c7daf548ebc9869237 /include/gtest/gtest.h | |
| parent | 3c7868a9a8fab4fd9209bbd2d2f1ae269d063680 (diff) | |
| download | googletest-0af0709b02899f9177db55eba7929e65e5834b29.tar.gz googletest-0af0709b02899f9177db55eba7929e65e5834b29.tar.bz2 googletest-0af0709b02899f9177db55eba7929e65e5834b29.zip | |
Cleans up macro definitions.
Diffstat (limited to 'include/gtest/gtest.h')
| -rw-r--r-- | include/gtest/gtest.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index f28757de..7fecb92f 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -390,7 +390,7 @@ class TestInfo { // Returns the result of the test. const internal::TestResult* result() const; private: -#ifdef GTEST_HAS_DEATH_TEST +#if GTEST_HAS_DEATH_TEST friend class internal::DefaultDeathTestFactory; #endif // GTEST_HAS_DEATH_TEST friend class internal::TestInfoImpl; @@ -521,7 +521,7 @@ class UnitTest { // or NULL if no test is running. const TestInfo* current_test_info() const; -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST // Returns the ParameterizedTestCaseRegistry object used to keep track of // value-parameterized tests and instantiate and register them. internal::ParameterizedTestCaseRegistry& parameterized_test_registry(); @@ -940,7 +940,7 @@ class AssertHelper { } // namespace internal -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST // The abstract base class that all value-parameterized tests inherit from. // // This class adds support for accessing the test parameter value via @@ -1234,7 +1234,7 @@ AssertionResult DoubleLE(const char* expr1, const char* expr2, double val1, double val2); -#ifdef GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS // Macros that test for HRESULT failure and success, these are only useful // on Windows, and rely on Windows SDK macros and APIs to compile. |