Remove gcc 4.4 workaround

This commit is contained in:
Victor Zverovich 2020-03-07 14:50:52 -08:00
parent 48e8d0ebef
commit b1adaa9881
2 changed files with 1 additions and 14 deletions

View File

@ -48,17 +48,6 @@ endif ()
set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG}) 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 <class T, class ...Types>
struct S { typedef typename S<Types...>::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 if user-defined literals are available
check_cxx_source_compiles(" check_cxx_source_compiles("
void operator\"\" _udl(long double); void operator\"\" _udl(long double);

View File

@ -17,9 +17,7 @@ else ()
target_compile_definitions(gmock PUBLIC GTEST_HAS_PTHREAD=0) target_compile_definitions(gmock PUBLIC GTEST_HAS_PTHREAD=0)
endif () endif ()
if (NOT SUPPORTS_VARIADIC_TEMPLATES) target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0)
target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0)
endif ()
if (MSVC) if (MSVC)
# Workaround a bug in implementation of variadic templates in MSVC11. # Workaround a bug in implementation of variadic templates in MSVC11.