commit 0998fe96ce8c8dbe7e9f9e68dd7fbb48062d310e
author Austin Kinross <aukinros@microsoft.com> Fri Dec 11 11:31:38 2015 -0800
committer Geoff Lang <geofflang@chromium.org> Mon Dec 14 15:20:06 2015 +0000
tree 32b4e3a847d3350ab8f8a8aa3ae172a27f757769
parent 8e89866da6d656c6e59d009bba32f7706d943abe

Fix Clang 3.7 build issue in VS 2015 Update 1

VS 2015 Update 1 adds support for 'Clang 3.7 with Microsoft CodeGen'.

This fixes these errors when using Clang 3.7 in VS2015:

compiler\translator\ASTMetadataHLSL.cpp(69,10): error : 'visitLoop' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
compiler\translator\ASTMetadataHLSL.cpp(75,10): error : 'visitSelection' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
compiler\translator\ASTMetadataHLSL.cpp(336,10): error : 'visitLoop' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]

Change-Id: Ia9c3029eb2966132827596b55ad9afce34b6f19c
Reviewed-on: https://chromium-review.googlesource.com/317732
Tryjob-Request: Austin Kinross <aukinros@microsoft.com>
Tested-by: Austin Kinross <aukinros@microsoft.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/ASTMetadataHLSL.cpp

diff --git a/src/compiler/translator/ASTMetadataHLSL.cpp b/src/compiler/translator/ASTMetadataHLSL.cpp
index cc21a00..31bfae9 100644
--- a/src/compiler/translator/ASTMetadataHLSL.cpp
+++ b/src/compiler/translator/ASTMetadataHLSL.cpp
@@ -66,13 +66,13 @@
         }
     }
 
-    bool visitLoop(Visit visit, TIntermLoop *loop)
+    bool visitLoop(Visit visit, TIntermLoop *loop) override
     {
         visitControlFlow(visit, loop);
         return true;
     }
 
-    bool visitSelection(Visit visit, TIntermSelection *selection)
+    bool visitSelection(Visit visit, TIntermSelection *selection) override
     {
         visitControlFlow(visit, selection);
         return true;
@@ -333,7 +333,7 @@
         ASSERT(mNestedDiscont == (mMetadata->mCalledInDiscontinuousLoop ? 1 : 0));
     }
 
-    bool visitLoop(Visit visit, TIntermLoop *loop)
+    bool visitLoop(Visit visit, TIntermLoop *loop) override
     {
         bool isDiscontinuous = mMetadata->mDiscontinuousLoops.count(loop) > 0;