mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #732 from dneto0/fix-overrides

Browse Source 
Add override where needed by clang++
This commit is contained in:
John Kessenich 2017-02-21 13:09:05 -07:00 committed by GitHub
commit c8aed91524
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glslang/MachineIndependent/SymbolTable.h
View File

@ -229,11 +229,11 @@ public:
returnType.shallowCopy(retType); returnType.shallowCopy(retType);
declaredBuiltIn = retType.getQualifier().builtIn; declaredBuiltIn = retType.getQualifier().builtIn;
} }
virtual TFunction* clone() const; virtual TFunction* clone() const override;
virtual ~TFunction(); virtual ~TFunction();
virtual TFunction* getAsFunction() { return this; } virtual TFunction* getAsFunction() override { return this; }
virtual const TFunction* getAsFunction() const { return this; } virtual const TFunction* getAsFunction() const override { return this; }
virtual void addParameter(TParameter& p) virtual void addParameter(TParameter& p)
{ {
@ -251,10 +251,10 @@ public:
mangledName.insert(0, prefix); mangledName.insert(0, prefix);
} }
virtual const TString& getMangledName() const { return mangledName; } virtual const TString& getMangledName() const override { return mangledName; }
virtual const TType& getType() const { return returnType; } virtual const TType& getType() const override { return returnType; }
virtual TBuiltInVariable getDeclaredBuiltInType() const { return declaredBuiltIn; } 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 void relateToOperator(TOperator o) { assert(writable); op = o; }
virtual TOperator getBuiltInOp() const { return op; } virtual TOperator getBuiltInOp() const { return op; }
virtual void setDefined() { assert(writable); defined = true; } virtual void setDefined() { assert(writable); defined = true; }
@ -272,7 +272,7 @@ public:
virtual TParameter& operator[](int i) { assert(writable); return parameters[i]; } virtual TParameter& operator[](int i) { assert(writable); return parameters[i]; }
virtual const TParameter& operator[](int i) const { 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: protected:
explicit TFunction(const TFunction&); explicit TFunction(const TFunction&);