diff options
| author | Abseil Team <absl-team@google.com> | 2021-01-26 21:24:04 (GMT) |
|---|---|---|
| committer | Dino Radaković <dinor@google.com> | 2021-02-05 18:39:30 (GMT) |
| commit | d1143988003cad7be2f22cd2d9cc73ed2f256da4 (patch) | |
| tree | e447bd236240278ce1b364bf35a6a8c69fb7e07b /googletest/include/gtest/internal | |
| parent | 273f8cb059a4e7b089731036392422b5ef489791 (diff) | |
| download | googletest-d1143988003cad7be2f22cd2d9cc73ed2f256da4.zip googletest-d1143988003cad7be2f22cd2d9cc73ed2f256da4.tar.gz googletest-d1143988003cad7be2f22cd2d9cc73ed2f256da4.tar.bz2 | |
Googletest export
Remove uses of GTEST_HAS_TYPED_TEST_P and GTEST_HAS_TYPED_TEST.
PiperOrigin-RevId: 353935996
Diffstat (limited to 'googletest/include/gtest/internal')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 4 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-type-util.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 8dc74bb..fd70a22 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -590,8 +590,6 @@ GTEST_API_ TestInfo* MakeAndRegisterTestInfo( // and returns false. None of pstr, *pstr, and prefix can be NULL. GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr); -#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ /* class A needs to have dll-interface to be used by clients of class B */) @@ -823,8 +821,6 @@ class TypeParameterizedTestSuite<Fixture, internal::None, Types> { } }; -#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - // Returns the current OS stack trace as an std::string. // // The maximum number of stack frames to be included is specified by diff --git a/googletest/include/gtest/internal/gtest-type-util.h b/googletest/include/gtest/internal/gtest-type-util.h index c3326f2..5a6ca8d 100644 --- a/googletest/include/gtest/internal/gtest-type-util.h +++ b/googletest/include/gtest/internal/gtest-type-util.h @@ -98,8 +98,6 @@ std::string GetTypeName() { #endif // GTEST_HAS_RTTI } -#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - // A unique type indicating an empty node struct None {}; @@ -175,8 +173,6 @@ struct GenerateTypeList { using type = typename proxy::type; }; -#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - } // namespace internal template <typename... Ts> |