summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2018-11-20 15:26:17 (GMT)
committerGennadiy Civil <misterg@google.com>2018-11-20 18:30:06 (GMT)
commitbb7c0ecbdf47a5c61d212cbfd2177bf3bf18479b (patch)
tree9c62d1eb92dddadef7e33f53afb56bb215c61000 /googlemock
parentb49266606875a8fa6cac79a05002d490a9a2af07 (diff)
downloadgoogletest-bb7c0ecbdf47a5c61d212cbfd2177bf3bf18479b.zip
googletest-bb7c0ecbdf47a5c61d212cbfd2177bf3bf18479b.tar.gz
googletest-bb7c0ecbdf47a5c61d212cbfd2177bf3bf18479b.tar.bz2
Googletest export
Silence C4100 msvc warning PiperOrigin-RevId: 222242329
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/include/gmock/gmock-actions.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h
index 37d0d53..9a637ce 100644
--- a/googlemock/include/gmock/gmock-actions.h
+++ b/googlemock/include/gmock/gmock-actions.h
@@ -54,6 +54,11 @@
#include <type_traits>
#endif // GTEST_LANG_CXX11
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
namespace testing {
// To implement an action Foo, define:
@@ -1308,4 +1313,9 @@ inline internal::ReferenceWrapper<T> ByRef(T& l_value) { // NOLINT
} // namespace testing
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+
#endif // GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_