Add bitmask type

[alexxy/gromacs.git] / src / external / gmock-1.7.0 / gtest / include / gtest / gtest.h

diff --git a/src/external/gmock-1.7.0/gtest/include/gtest/gtest.h b/src/external/gmock-1.7.0/gtest/include/gtest/gtest.h
index 6fa0a3925e7207b3087e0e3f202f343d4e408043..f76d8bea1eb45d265dbab007a217d826aed1a60c 100644 (file)
--- a/src/external/gmock-1.7.0/gtest/include/gtest/gtest.h
+++ b/src/external/gmock-1.7.0/gtest/include/gtest/gtest.h
@@ -1443,6 +1443,8 @@ AssertionResult CmpHelperEQ(const char* expected_expression,
 # pragma warning(push)          // Saves the current warning state.
 # pragma warning(disable:4389)  // Temporarily disables warning on
                                 // signed/unsigned mismatch.
+# pragma warning(disable:4805)  // Temporarily disables warning on
+                                // unsafe mix of types
 #endif
 
   if (expected == actual) {