commit c4eca923de1f480a63a0aa1b41ee371258518fa1
author Olli Etuaho <oetuaho@nvidia.com> Mon Nov 13 12:27:23 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Nov 13 14:06:10 2017 +0000
tree b37ee561758119cc03ad556c3a9793764eca33bc
parent 1974452966bb05cc471f03864274af5c631f6370

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>

src/libANGLE/renderer/gl/ProgramGL.cpp

diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
index a947636..34b407c 100644
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -603,7 +603,7 @@
                                      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];

src/libGLESv2.gypi

diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
index 44581ce..cdefc31 100644
--- 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',