diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-11-13 21:10:41 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-11-13 21:10:42 -0500 |
| commit | 7a0680dc223088211807f1b19598dfe01b3bab8b (patch) | |
| tree | 8cc0e01ea848a037e681143cb521bc08e4132c5b /googlemock/include/gmock/internal/gmock-port.h | |
| parent | b18d39bd2ea2d2b508228a9a1d8ae9f7fba32f78 (diff) | |
| parent | 48021336904c12e129e372a46b0995647a345b1e (diff) | |
| download | googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.tar.gz googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.tar.bz2 googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.zip | |
Merge pull request #1959 from robinlinden:remove-msvc-workarounds
PiperOrigin-RevId: 221356626
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-port.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-port.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/include/gmock/internal/gmock-port.h b/googlemock/include/gmock/internal/gmock-port.h index c5932493..063e2929 100644 --- a/googlemock/include/gmock/internal/gmock-port.h +++ b/googlemock/include/gmock/internal/gmock-port.h @@ -55,10 +55,10 @@ #include "gtest/internal/gtest-port.h" #include "gmock/internal/custom/gmock-port.h" -// For MS Visual C++, check the compiler version. At least VS 2003 is +// For MS Visual C++, check the compiler version. At least VS 2015 is // required to compile Google Mock. -#if defined(_MSC_VER) && _MSC_VER < 1310 -# error "At least Visual C++ 2003 (7.1) is required to compile Google Mock." +#if defined(_MSC_VER) && _MSC_VER < 1900 +# error "At least Visual C++ 2015 (14.0) is required to compile Google Mock." #endif // Macro for referencing flags. This is public as we want the user to |