Commit 0998fe96 by Austin Kinross Committed by Geoff Lang

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: 's avatarAustin Kinross <aukinros@microsoft.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 8e89866d
...@@ -66,13 +66,13 @@ class PullGradient : public TIntermTraverser ...@@ -66,13 +66,13 @@ class PullGradient : public TIntermTraverser
} }
} }
bool visitLoop(Visit visit, TIntermLoop *loop) bool visitLoop(Visit visit, TIntermLoop *loop) override
{ {
visitControlFlow(visit, loop); visitControlFlow(visit, loop);
return true; return true;
} }
bool visitSelection(Visit visit, TIntermSelection *selection) bool visitSelection(Visit visit, TIntermSelection *selection) override
{ {
visitControlFlow(visit, selection); visitControlFlow(visit, selection);
return true; return true;
...@@ -333,7 +333,7 @@ class PushDiscontinuousLoops : public TIntermTraverser ...@@ -333,7 +333,7 @@ class PushDiscontinuousLoops : public TIntermTraverser
ASSERT(mNestedDiscont == (mMetadata->mCalledInDiscontinuousLoop ? 1 : 0)); 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; bool isDiscontinuous = mMetadata->mDiscontinuousLoops.count(loop) > 0;
......
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