Fix MSVS 2015 warnings

Fix warnings about implicit int to bool conversion and noexcept. TEST=build on MVSV 2015 Change-Id: I437977ca01f62ce2df39872da5903a0338a73bba Reviewed-on: https://chromium-review.googlesource.com/765371 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix MSVS 2015 warnings
c4eca923 · Olli Etuaho · Commit Bot · 19744529 · c4eca923 · c4eca923
Commit c4eca923 authored Nov 13, 2017 by Olli Etuaho Committed by Commit Bot Nov 13, 2017
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ProgramGL.cpp src/libANGLE/renderer/gl/ProgramGL.cpp +1 -1

libGLESv2.gypi src/libGLESv2.gypi +4 -0

No files found.
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -603,7 +603,7 @@ bool ProgramGL::getShaderStorageBlockMemberInfo(const std::string & /* memberNam
                                     props.data(), kPropCount, &length, params.data());
    ASSERT(kPropCount == length);
    memberInfoOut->arrayStride         = params[0];
-    memberInfoOut->isRowMajorMatrix    = params[1];
+    memberInfoOut->isRowMajorMatrix    = params[1] != 0;
    memberInfoOut->matrixStride        = params[2];
    memberInfoOut->offset              = params[3];
    memberInfoOut->topLevelArrayStride = params[4];

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -969,6 +969,10 @@
            [
                'LIBANGLE_IMPLEMENTATION',
            ],
+            'msvs_disabled_warnings':
+            [
+                4577, # 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed.
+            ],
            'export_dependent_settings':
            [
                'angle_common',