diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-10-25 18:48:43 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-10-25 18:48:43 +0000 |
| commit | e04d43d1faef8e09550a899fe4d0e4cf46570ce4 (patch) | |
| tree | 6b6392066340c37472be071bb6db82b21f1700ea /cmake/Modules | |
| parent | 5452863ad44d88e3459732596a65016293b3f1e7 (diff) | |
Remove a VS 2012 workaround, we require 2015 now.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@285096 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 1a2e48992..42ae7ad1e 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -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, |