[llvm] 4901199 - GTEST_HAS_TR1_TUPLE is gone, stop defining it.

[Benjamin Kramer via llvm-commits]

Author: Benjamin Kramer
Date: 2021-05-14T21:14:32+02:00
New Revision: 4901199f5b84b2234e9a06e307b0235a1de2dacf

URL: https://github.com/llvm/llvm-project/commit/4901199f5b84b2234e9a06e307b0235a1de2dacf
DIFF: https://github.com/llvm/llvm-project/commit/4901199f5b84b2234e9a06e307b0235a1de2dacf.diff

LOG: GTEST_HAS_TR1_TUPLE is gone, stop defining it.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
    llvm/utils/unittest/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
index cc92478d2492..9b9e0e5bd528 100644
--- a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
@@ -11,7 +11,6 @@ config("googletest_config") {
   # of C++11 on MSVC, so we force it on.
   defines = [
     "GTEST_LANG_CXX11",
-    "GTEST_HAS_TR1_TUPLE=0",
   ]
   if (host_os == "win") {
     defines += [ "GTEST_OS_WINDOWS" ]

diff  --git a/llvm/utils/unittest/CMakeLists.txt b/llvm/utils/unittest/CMakeLists.txt
index 43c8fafdfc4c..90037ae2e44b 100644
--- a/llvm/utils/unittest/CMakeLists.txt
+++ b/llvm/utils/unittest/CMakeLists.txt
@@ -61,9 +61,6 @@ if(CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG)
   set_target_properties(gtest PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-suggest-override")
 endif()
 
-# Gtest 1.8.0 uses tr1/tuple which is deprecated on MSVC, so we force it off.
-target_compile_definitions(gtest PUBLIC GTEST_HAS_TR1_TUPLE=0)
-
 if (NOT LLVM_ENABLE_THREADS)
   target_compile_definitions(gtest PUBLIC GTEST_HAS_PTHREAD=0)
 endif ()