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 | 9bf9aa5106eb663a371b2b0bc7ab929500ad6ff9 (patch) | |
| tree | b5363e683e19c72b50582f092707d3ae203c7b8c /utils/unittest | |
| parent | 0478c15d1ecdbc53cf106419629479bcb2a0f4af (diff) | |
Fixes warnings emitted by Visual Studio 2010 compiler.
Patch by Erik Olofsson!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126796 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/gtest.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/unittest/googletest/include/gtest/gtest.h b/utils/unittest/googletest/include/gtest/gtest.h index 921fad11fc..5470082abd 100644 --- a/utils/unittest/googletest/include/gtest/gtest.h +++ b/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) { |