From 4957858705c6db90d0f263568e197ce5a12dca48 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 1 Sep 2026 12:12:13 -0700 Subject: [PATCH] Remove some obsolete GCC workarounds PiperOrigin-RevId: 974635453 Change-Id: I7bb066be8461080d6f908671d2001dbca3ee4a03 --- googletest/cmake/internal_utils.cmake | 10 ++-------- googletest/include/gtest/internal/gtest-port.h | 7 ------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 10c55955..3ead0892 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -113,16 +113,10 @@ macro(config_compiler_and_linker) endif() endif() elseif (CMAKE_COMPILER_IS_GNUCXX) - set(cxx_base_flags "-Wall -Wshadow -Wundef") - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) - set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") - endif() + set(cxx_base_flags "-Wall -Wshadow -Wundef -Wno-error=dangling-else") set(cxx_exception_flags "-fexceptions") set(cxx_no_exception_flags "-fno-exceptions") - # Until version 4.3.2, GCC doesn't define a macro to indicate - # whether RTTI is enabled. Therefore we define GTEST_HAS_RTTI - # explicitly. - set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0") + set(cxx_no_rtti_flags "-fno-rtti") set(cxx_strict_flags "-Wextra -Wno-unused-parameter -Wno-missing-field-initializers") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro") diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 116cb6f9..249bfb75 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -341,13 +341,6 @@ #define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest" #endif // !defined(GTEST_INIT_GOOGLE_TEST_NAME_) -// Determines the version of gcc that is used to compile this. -#ifdef __GNUC__ -// 40302 means version 4.3.2. -#define GTEST_GCC_VER_ \ - (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -#endif // __GNUC__ - // Macros for disabling Microsoft Visual C++ warnings. // // GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)