diff options
| author | Andy Soffer <804265+asoffer@users.noreply.github.com> | 2023-05-01 14:27:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 14:27:38 -0400 |
| commit | 76bce79a3493aa157b3baca833fec1e3934d3512 (patch) | |
| tree | 535cdfa334eb203cfd03505c82904e314ba7b153 /googletest/include/gtest/internal/gtest-internal.h | |
| parent | 6f1c4b3d7b139c7217698bf4115be9f40785f661 (diff) | |
| parent | f345b2ca6adb1b505049190867eedf24d3b5eaa3 (diff) | |
| download | googletest-git-76bce79a3493aa157b3baca833fec1e3934d3512.tar.gz | |
Merge branch 'main' into fixes_std_pair_diff
Diffstat (limited to 'googletest/include/gtest/internal/gtest-internal.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index e1eb2b51..317894e7 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -41,7 +41,7 @@ #include "gtest/internal/gtest-port.h" -#if GTEST_OS_LINUX +#ifdef GTEST_OS_LINUX #include <stdlib.h> #include <sys/types.h> #include <sys/wait.h> @@ -435,7 +435,7 @@ GTEST_API_ TypeId GetTestTypeId(); // of a Test object. class TestFactoryBase { public: - virtual ~TestFactoryBase() {} + virtual ~TestFactoryBase() = default; // Creates a test instance to run. The instance is both created and destroyed // within TestInfoImpl::Run() @@ -457,7 +457,7 @@ class TestFactoryImpl : public TestFactoryBase { Test* CreateTest() override { return new TestClass; } }; -#if GTEST_OS_WINDOWS +#ifdef GTEST_OS_WINDOWS // Predicate-formatters for implementing the HRESULT checking macros // {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED} @@ -900,8 +900,10 @@ class HasDebugStringAndShortDebugString { HasDebugStringType::value && HasShortDebugStringType::value; }; +#ifdef GTEST_INTERNAL_NEED_REDUNDANT_CONSTEXPR_DECL template <typename T> constexpr bool HasDebugStringAndShortDebugString<T>::value; +#endif // When the compiler sees expression IsContainerTest<C>(0), if C is an // STL-style container class, the first overload of IsContainerTest |