summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-more-matchers.h
diff options
context:
space:
mode:
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
-rw-r--r--googlemock/include/gmock/gmock-more-matchers.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h
index 4c24832..6d810eb 100644
--- a/googlemock/include/gmock/gmock-more-matchers.h
+++ b/googlemock/include/gmock/gmock-more-matchers.h
@@ -49,6 +49,8 @@ namespace testing {
# pragma warning(push)
# pragma warning(disable:4100)
#if (_MSC_VER == 1900)
+// and silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 14
# pragma warning(disable:4800)
#endif
#endif