From 432576fdce62521d187afd941a8c27072ee5cfa1 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Mon, 19 Dec 2016 14:43:42 -0700
Subject: [PATCH] Build: Fix #633, add missing overrides.
---
glslang/Include/revision.h | 2 +-
glslang/MachineIndependent/ParseHelper.h | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index d90b8c785..3cbc006a7 100644
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
-#define GLSLANG_REVISION "Overload400-PrecQual.1696"
+#define GLSLANG_REVISION "Overload400-PrecQual.1704"
#define GLSLANG_DATE "19-Dec-2016"
diff --git a/glslang/MachineIndependent/ParseHelper.h b/glslang/MachineIndependent/ParseHelper.h
index eb1a0538b..f850f0897 100644
--- a/glslang/MachineIndependent/ParseHelper.h
+++ b/glslang/MachineIndependent/ParseHelper.h
@@ -237,23 +237,23 @@ public:
bool obeyPrecisionQualifiers() const { return precisionManager.respectingPrecisionQualifiers(); };
void setPrecisionDefaults();
- void setLimits(const TBuiltInResource&);
- bool parseShaderStrings(TPpContext&, TInputScanner& input, bool versionWillBeError = false);
+ void setLimits(const TBuiltInResource&) override;
+ bool parseShaderStrings(TPpContext&, TInputScanner& input, bool versionWillBeError = false) override;
void parserError(const char* s); // for bison's yyerror
void reservedErrorCheck(const TSourceLoc&, const TString&);
- void reservedPpErrorCheck(const TSourceLoc&, const char* name, const char* op);
- bool lineContinuationCheck(const TSourceLoc&, bool endOfComment);
- bool lineDirectiveShouldSetNextLine() const;
+ void reservedPpErrorCheck(const TSourceLoc&, const char* name, const char* op) override;
+ bool lineContinuationCheck(const TSourceLoc&, bool endOfComment) override;
+ bool lineDirectiveShouldSetNextLine() const override;
bool builtInName(const TString&);
- void handlePragma(const TSourceLoc&, const TVector<TString>&);
+ void handlePragma(const TSourceLoc&, const TVector<TString>&) override;
TIntermTyped* handleVariable(const TSourceLoc&, TSymbol* symbol, const TString* string);
TIntermTyped* handleBracketDereference(const TSourceLoc&, TIntermTyped* base, TIntermTyped* index);
void checkIndex(const TSourceLoc&, const TType&, int& index);
void handleIndexLimits(const TSourceLoc&, TIntermTyped* base, TIntermTyped* index);
- void makeEditable(TSymbol*&);
+ void makeEditable(TSymbol*&) override;
bool isIoResizeArray(const TType&) const;
void fixIoArraySize(const TSourceLoc&, TType&);
void ioArrayCheck(const TSourceLoc&, const TType&, const TString& identifier);
--
GitLab