diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 16:03:40 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 16:03:40 (GMT) |
| commit | c4684b49cf0d4334dfb522fcb3c8012cb63a4f61 (patch) | |
| tree | 60b665462dff0e3767eefcc0f74ed886eb4fdaed /googlemock/src | |
| parent | 431bfdcaf4a0f08c7ebd571291bf41d06195c20d (diff) | |
| download | googletest-c4684b49cf0d4334dfb522fcb3c8012cb63a4f61.zip googletest-c4684b49cf0d4334dfb522fcb3c8012cb63a4f61.tar.gz googletest-c4684b49cf0d4334dfb522fcb3c8012cb63a4f61.tar.bz2 | |
more msvc
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-all.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/googlemock/src/gmock-all.cc b/googlemock/src/gmock-all.cc index 203bdb9..7aebce7 100644 --- a/googlemock/src/gmock-all.cc +++ b/googlemock/src/gmock-all.cc @@ -37,16 +37,6 @@ // This line ensures that gmock.h can be compiled on its own, even // when it's fused. - -// Silence C4800 (C4800: 'int *const ': forcing value -// to bool 'true' or 'false') for MSVC 14,15 -#ifdef _MSC_VER -#if _MSC_VER <= 1900 -# pragma warning(push) -# pragma warning(disable:4800) -#endif -#endif - #include "gmock/gmock.h" // The following lines pull in the real gmock *.cc files. @@ -55,9 +45,3 @@ #include "src/gmock-matchers.cc" #include "src/gmock-spec-builders.cc" #include "src/gmock.cc" - -#ifdef _MSC_VER -#if _MSC_VER == 1900 -# pragma warning(pop) -#endif -#endif |