aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-more-matchers.h
diff options
context:
space:
mode:
authorTanzinul Islam <t_17_7@hotmail.com>2018-05-05 19:53:33 +0100
committerTanzinul Islam <t_17_7@hotmail.com>2018-05-05 19:53:33 +0100
commit10f05a627c2da8d7de78da1b08f984ce8de398fb (patch)
tree4f799952ac6fa35647a653cc12caf42efd73e005 /googlemock/include/gmock/gmock-more-matchers.h
parent5c7c365d5f3e5467de350f2e81a31407a3f52505 (diff)
parent278aba369c41e90e9e77a6f51443beb3692919cf (diff)
downloadgoogletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.gz
googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.bz2
googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.zip
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
-rw-r--r--googlemock/include/gmock/gmock-more-matchers.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h
index a5a8bfa5..6d810eb7 100644
--- a/googlemock/include/gmock/gmock-more-matchers.h
+++ b/googlemock/include/gmock/gmock-more-matchers.h
@@ -43,6 +43,18 @@
namespace testing {
+// Silence C4100 (unreferenced formal
+// parameter) for MSVC
+#ifdef _MSC_VER
+# 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
+
// Defines a matcher that matches an empty container. The container must
// support both size() and empty(), which all STL-like containers provide.
MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
@@ -69,6 +81,11 @@ MATCHER(IsFalse, negation ? "is true" : "is false") {
return !static_cast<bool>(arg);
}
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+
} // namespace testing
#endif // GMOCK_GMOCK_MORE_MATCHERS_H_