From 9bf9aa5106eb663a371b2b0bc7ab929500ad6ff9 Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Tue, 1 Mar 2011 23:11:57 +0000 Subject: 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 --- utils/unittest/googletest/include/gtest/gtest.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'utils/unittest') 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) { -- cgit v1.2.3