From b1adaa9881a15f9777e4bc725b477eef26bedbf6 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 7 Mar 2020 14:50:52 -0800 Subject: [PATCH] Remove gcc 4.4 workaround --- support/cmake/cxx14.cmake | 11 ----------- test/CMakeLists.txt | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/support/cmake/cxx14.cmake b/support/cmake/cxx14.cmake index 032fcb27..16ff5754 100644 --- a/support/cmake/cxx14.cmake +++ b/support/cmake/cxx14.cmake @@ -48,17 +48,6 @@ endif () set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG}) -# Check if variadic templates are working and not affected by GCC bug 39653: -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=39653 -# Can be removed once gcc 4.4 support is dropped. -check_cxx_source_compiles(" - template - struct S { typedef typename S::type type; }; - int main() {}" SUPPORTS_VARIADIC_TEMPLATES) -if (NOT SUPPORTS_VARIADIC_TEMPLATES) - set (SUPPORTS_VARIADIC_TEMPLATES OFF) -endif () - # Check if user-defined literals are available check_cxx_source_compiles(" void operator\"\" _udl(long double); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ad391c22..89176633 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -17,9 +17,7 @@ else () target_compile_definitions(gmock PUBLIC GTEST_HAS_PTHREAD=0) endif () -if (NOT SUPPORTS_VARIADIC_TEMPLATES) - target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0) -endif () +target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0) if (MSVC) # Workaround a bug in implementation of variadic templates in MSVC11.