diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-03-01 23:11:57 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-03-01 23:11:57 +0000 |
| commit | 98a3c80a3ebdca2379fab4ae225512bb1d20a3bd (patch) | |
| tree | b8019ed86b30a2ebe30b5c2954f9ac1423a33e8f /llvm/utils/unittest | |
| parent | 3bc2dedb403f23e38f4ab765fe2b78bd101f041d (diff) | |
| download | bcm5719-llvm-98a3c80a3ebdca2379fab4ae225512bb1d20a3bd.tar.gz bcm5719-llvm-98a3c80a3ebdca2379fab4ae225512bb1d20a3bd.zip | |
Fixes warnings emitted by Visual Studio 2010 compiler.
Patch by Erik Olofsson!
llvm-svn: 126796
Diffstat (limited to 'llvm/utils/unittest')
| -rw-r--r-- | llvm/utils/unittest/googletest/include/gtest/gtest.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest.h b/llvm/utils/unittest/googletest/include/gtest/gtest.h index 921fad11fcc..5470082abd4 100644 --- a/llvm/utils/unittest/googletest/include/gtest/gtest.h +++ b/llvm/utils/unittest/googletest/include/gtest/gtest.h @@ -1258,6 +1258,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) { |
