From 4c64a40d41d17a72328e243db62824679ba23c31 Mon Sep 17 00:00:00 2001 From: David Neto Date: Tue, 21 Feb 2017 14:41:15 -0500 Subject: [PATCH] Add override where needed by clang++ Otherwise we get an error when we have both -Werror and -Winconsistent-missing-override. This is required for building with NDK r14 betas --- glslang/MachineIndependent/SymbolTable.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/glslang/MachineIndependent/SymbolTable.h b/glslang/MachineIndependent/SymbolTable.h index 29ee40e..c85b067 100644 --- a/glslang/MachineIndependent/SymbolTable.h +++ b/glslang/MachineIndependent/SymbolTable.h @@ -229,11 +229,11 @@ public: returnType.shallowCopy(retType); declaredBuiltIn = retType.getQualifier().builtIn; } - virtual TFunction* clone() const; + virtual TFunction* clone() const override; virtual ~TFunction(); - virtual TFunction* getAsFunction() { return this; } - virtual const TFunction* getAsFunction() const { return this; } + virtual TFunction* getAsFunction() override { return this; } + virtual const TFunction* getAsFunction() const override { return this; } virtual void addParameter(TParameter& p) { @@ -251,10 +251,10 @@ public: mangledName.insert(0, prefix); } - virtual const TString& getMangledName() const { return mangledName; } - virtual const TType& getType() const { return returnType; } + virtual const TString& getMangledName() const override { return mangledName; } + virtual const TType& getType() const override { return returnType; } virtual TBuiltInVariable getDeclaredBuiltInType() const { return declaredBuiltIn; } - virtual TType& getWritableType() { return returnType; } + virtual TType& getWritableType() override { return returnType; } virtual void relateToOperator(TOperator o) { assert(writable); op = o; } virtual TOperator getBuiltInOp() const { return op; } virtual void setDefined() { assert(writable); defined = true; } @@ -272,7 +272,7 @@ public: virtual TParameter& operator[](int i) { assert(writable); return parameters[i]; } virtual const TParameter& operator[](int i) const { return parameters[i]; } - virtual void dump(TInfoSink &infoSink) const; + virtual void dump(TInfoSink &infoSink) const override; protected: explicit TFunction(const TFunction&); -- 2.7.4