Skip to content

A
angle
Commit 9c3a393d by apatrick@chromium.org
Options

Enabled MSVC warning 4389 : signed/unsigned mismatch.

I also fixed Config.cpp so it compiles without the warning. This is because this is now a warning as error in Chromium. Review URL: https://codereview.appspot.com/5600047 git-svn-id: https://angleproject.googlecode.com/svn/trunk@980 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 26f6e5d8
Showing with 24 additions and 24 deletions
build/common.gypi
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
], ],
'RuntimeTypeInfo': 'false', 'RuntimeTypeInfo': 'false',
'WarningLevel': '4', 'WarningLevel': '4',
'DisableSpecificWarnings': '4100;4127;4189;4239;4244;4245;4389;4512;4702', 'DisableSpecificWarnings': '4100;4127;4189;4239;4244;4245;4512;4702',
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'FixedBaseAddress': '1', 'FixedBaseAddress': '1',
......
src/common/version.h
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 978 #define BUILD_REVISION 980
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
src/compiler/translator_common.vcproj
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702;4718" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702;4718"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
WarnAsError="true" WarnAsError="true"
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702;4718" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702;4718"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702;4718" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702;4718"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702;4718" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702;4718"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
......
src/compiler/translator_hlsl.vcproj
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
DebugInformationFormat="4" DebugInformationFormat="4"
WarnAsError="true" WarnAsError="true"
/> />
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
/> />
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
/> />
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
/> />
......
src/libEGL/Config.cpp
...@@ -321,25 +321,25 @@ bool ConfigSet::getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint ...@@ -321,25 +321,25 @@ bool ConfigSet::getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint
case EGL_RED_SIZE: match = config->mRedSize >= attribute[1]; break; case EGL_RED_SIZE: match = config->mRedSize >= attribute[1]; break;
case EGL_DEPTH_SIZE: match = config->mDepthSize >= attribute[1]; break; case EGL_DEPTH_SIZE: match = config->mDepthSize >= attribute[1]; break;
case EGL_STENCIL_SIZE: match = config->mStencilSize >= attribute[1]; break; case EGL_STENCIL_SIZE: match = config->mStencilSize >= attribute[1]; break;
case EGL_CONFIG_CAVEAT: match = config->mConfigCaveat == attribute[1]; break; case EGL_CONFIG_CAVEAT: match = config->mConfigCaveat == (EGLenum) attribute[1]; break;
case EGL_CONFIG_ID: match = config->mConfigID == attribute[1]; break; case EGL_CONFIG_ID: match = config->mConfigID == attribute[1]; break;
case EGL_LEVEL: match = config->mLevel >= attribute[1]; break; case EGL_LEVEL: match = config->mLevel >= attribute[1]; break;
case EGL_NATIVE_RENDERABLE: match = config->mNativeRenderable == attribute[1]; break; case EGL_NATIVE_RENDERABLE: match = config->mNativeRenderable == (EGLBoolean) attribute[1]; break;
case EGL_NATIVE_VISUAL_TYPE: match = config->mNativeVisualType == attribute[1]; break; case EGL_NATIVE_VISUAL_TYPE: match = config->mNativeVisualType == attribute[1]; break;
case EGL_SAMPLES: match = config->mSamples >= attribute[1]; break; case EGL_SAMPLES: match = config->mSamples >= attribute[1]; break;
case EGL_SAMPLE_BUFFERS: match = config->mSampleBuffers >= attribute[1]; break; case EGL_SAMPLE_BUFFERS: match = config->mSampleBuffers >= attribute[1]; break;
case EGL_SURFACE_TYPE: match = (config->mSurfaceType & attribute[1]) == attribute[1]; break; case EGL_SURFACE_TYPE: match = (config->mSurfaceType & attribute[1]) == attribute[1]; break;
case EGL_TRANSPARENT_TYPE: match = config->mTransparentType == attribute[1]; break; case EGL_TRANSPARENT_TYPE: match = config->mTransparentType == (EGLenum) attribute[1]; break;
case EGL_TRANSPARENT_BLUE_VALUE: match = config->mTransparentBlueValue == attribute[1]; break; case EGL_TRANSPARENT_BLUE_VALUE: match = config->mTransparentBlueValue == attribute[1]; break;
case EGL_TRANSPARENT_GREEN_VALUE: match = config->mTransparentGreenValue == attribute[1]; break; case EGL_TRANSPARENT_GREEN_VALUE: match = config->mTransparentGreenValue == attribute[1]; break;
case EGL_TRANSPARENT_RED_VALUE: match = config->mTransparentRedValue == attribute[1]; break; case EGL_TRANSPARENT_RED_VALUE: match = config->mTransparentRedValue == attribute[1]; break;
case EGL_BIND_TO_TEXTURE_RGB: match = config->mBindToTextureRGB == attribute[1]; break; case EGL_BIND_TO_TEXTURE_RGB: match = config->mBindToTextureRGB == (EGLBoolean) attribute[1]; break;
case EGL_BIND_TO_TEXTURE_RGBA: match = config->mBindToTextureRGBA == attribute[1]; break; case EGL_BIND_TO_TEXTURE_RGBA: match = config->mBindToTextureRGBA == (EGLBoolean) attribute[1]; break;
case EGL_MIN_SWAP_INTERVAL: match = config->mMinSwapInterval == attribute[1]; break; case EGL_MIN_SWAP_INTERVAL: match = config->mMinSwapInterval == attribute[1]; break;
case EGL_MAX_SWAP_INTERVAL: match = config->mMaxSwapInterval == attribute[1]; break; case EGL_MAX_SWAP_INTERVAL: match = config->mMaxSwapInterval == attribute[1]; break;
case EGL_LUMINANCE_SIZE: match = config->mLuminanceSize >= attribute[1]; break; case EGL_LUMINANCE_SIZE: match = config->mLuminanceSize >= attribute[1]; break;
case EGL_ALPHA_MASK_SIZE: match = config->mAlphaMaskSize >= attribute[1]; break; case EGL_ALPHA_MASK_SIZE: match = config->mAlphaMaskSize >= attribute[1]; break;
case EGL_COLOR_BUFFER_TYPE: match = config->mColorBufferType == attribute[1]; break; case EGL_COLOR_BUFFER_TYPE: match = config->mColorBufferType == (EGLenum) attribute[1]; break;
case EGL_RENDERABLE_TYPE: match = (config->mRenderableType & attribute[1]) == attribute[1]; break; case EGL_RENDERABLE_TYPE: match = (config->mRenderableType & attribute[1]) == attribute[1]; break;
case EGL_MATCH_NATIVE_PIXMAP: match = false; UNIMPLEMENTED(); break; case EGL_MATCH_NATIVE_PIXMAP: match = false; UNIMPLEMENTED(); break;
case EGL_CONFORMANT: match = (config->mConformant & attribute[1]) == attribute[1]; break; case EGL_CONFORMANT: match = (config->mConformant & attribute[1]) == attribute[1]; break;
......
src/libEGL/libEGL.vcproj
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
WarnAsError="true" WarnAsError="true"
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
......
src/libGLESv2/libGLESv2.vcproj
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
WarnAsError="true" WarnAsError="true"
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702;4718" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702;4718"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702;4718" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702;4718"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4389;4512;4702;4718" DisableSpecificWarnings="4100;4127;4189;4239;4244;4245;4512;4702;4718"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
WarnAsError="true" WarnAsError="true"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment