Merge branch 'master' into master

2017-12-08 11:31:31 -05:00
parent 11d21b7c2a 4d1f930af8
commit 4aae1600d0
4 changed files with 7 additions and 5 deletions
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -75,7 +75,8 @@ include_directories("${gmock_SOURCE_DIR}/include"
 # VS 2012     11           1700            std::tr1::tuple + _VARIADIC_MAX=10
 # VS 2013     12           1800            std::tr1::tuple
 # VS 2015     14           1900            std::tuple
-# VS 2017     15           1910            std::tuple
+# VS 2017     15           >= 1910         std::tuple
+
 if (MSVC AND MSVC_VERSION EQUAL 1700)
  add_definitions(/D _VARIADIC_MAX=10)
 endif()