[compiler-rt] r285096 - Remove a VS 2012 workaround, we require 2015 now.

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Tue Oct 25 11:48:43 PDT 2016


Author: nico
Date: Tue Oct 25 13:48:43 2016
New Revision: 285096

URL: http://llvm.org/viewvc/llvm-project?rev=285096&view=rev
Log:
Remove a VS 2012 workaround, we require 2015 now.

Modified:
    compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake

Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=285096&r1=285095&r2=285096&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Tue Oct 25 13:48:43 2016
@@ -269,12 +269,6 @@ if(MSVC)
 
   # gtest use a lot of stuff marked as deprecated on Windows.
   list(APPEND COMPILER_RT_GTEST_CFLAGS -Wno-deprecated-declarations)
-
-  # Visual Studio 2012 only supports up to 8 template parameters in
-  # std::tr1::tuple by default, but gtest requires 10
-  if(MSVC_VERSION EQUAL 1700)
-    list(APPEND COMPILER_RT_GTEST_CFLAGS -D_VARIADIC_MAX=10)
-  endif()
 endif()
 
 # Link objects into a single executable with COMPILER_RT_TEST_COMPILER,




More information about the llvm-commits mailing list