summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-09 20:04:48 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-09 20:04:48 (GMT)
commitf5871009e6d8db73c0516efeb2955436b7134fb4 (patch)
tree005b6cab541c1d223fd4e9e674eca102fadcaecf /googletest
parent05b5a53898c2466e49f37e84324644949d279b34 (diff)
downloadgoogletest-f5871009e6d8db73c0516efeb2955436b7134fb4.zip
googletest-f5871009e6d8db73c0516efeb2955436b7134fb4.tar.gz
googletest-f5871009e6d8db73c0516efeb2955436b7134fb4.tar.bz2
yet more
Diffstat (limited to 'googletest')
-rw-r--r--googletest/include/gtest/gtest.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index c5d1b7c..efa98d5 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -83,12 +83,12 @@
namespace testing {
// Silence C4100 (unreferenced formal parameter) and 4805
-// unsafe mix of bool and type int for MSVC 14 and 15
+// unsafe mix of type 'const int' and type 'const bool'
#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4805)
# if _MSC_VER <= 1900
-# pragma warning(push)
# pragma warning(disable:4100)
-# pragma warning(disable:4805)
# endif
#endif