Fix C++17 builds:

- Fix C++17 Visual Studio builds.
- Use C++17 for `windows-2019` builds.
- Removed options for unsupported compiler (MSVC11).
- Removed options, not needed after enabling C++11+ features in gmock/gtest.

.github/workflows/windows.yml

@@ -12,18 +12,22 @@ jobs:
         os: [windows-2016, windows-2019]
         platform: [Win32, x64]
         build_type: [Debug, Release]
+        standard: [11, 14, 17]
         include:
-          - os: windows-2016
-            standard: 11
-          - os: windows-2019
-            standard: 14
           - os: windows-2016
             platform: Win32
             build_type: Debug
             shared: -DBUILD_SHARED_LIBS=ON
+            standard:
         exclude:
           - os: windows-2016
             platform: Win32
+          - os: windows-2016
+            standard: 14
+          - os: windows-2016
+            standard: 17
+          - os: windows-2019
+            standard: 11
 
     steps:
     - uses: actions/checkout@v2

test/CMakeLists.txt

@@ -17,12 +17,9 @@ else ()
   target_compile_definitions(gmock PUBLIC GTEST_HAS_PTHREAD=0)
 endif ()
 
-target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0)
+target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=1)
 
 if (MSVC)
-  # Workaround a bug in implementation of variadic templates in MSVC11.
-  target_compile_definitions(gmock PUBLIC _VARIADIC_MAX=10)
-
   # Disable MSVC warnings of _CRT_INSECURE_DEPRECATE functions.
   target_compile_definitions(gmock PRIVATE _CRT_SECURE_NO_WARNINGS)
   if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -31,11 +28,6 @@ if (MSVC)
   endif ()
 endif ()
 
-# GTest doesn't detect <tuple> with clang.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  target_compile_definitions(gmock PUBLIC GTEST_USE_OWN_TR1_TUPLE=1)
-endif ()
-
 # Silence MSVC tr1 deprecation warning in gmock.
 target_compile_definitions(gmock
   PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)