From f8d0d8c2b823432bcd88532426d8cdb12695b0f4 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Wed, 8 Feb 2017 17:31:03 -0700 Subject: [PATCH] Address issue #718. Should change which warning is generated, hopefully to a better one. --- glslang/Include/revision.h | 2 +- hlsl/hlslGrammar.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 64cdea7..fc96a22 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.1817" +#define GLSLANG_REVISION "Overload400-PrecQual.1819" #define GLSLANG_DATE "08-Feb-2017" diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp index cd68ee3..a454c44 100755 --- a/hlsl/hlslGrammar.cpp +++ b/hlsl/hlslGrammar.cpp @@ -2333,9 +2333,10 @@ bool HlslGrammar::acceptPostfixExpression(TIntermTyped*& node) struct tFinalize { tFinalize(HlslParseContext& p) : parseContext(p) { } ~tFinalize() { parseContext.finalizeFlattening(); } - HlslParseContext& parseContext; + HlslParseContext& parseContext; private: - tFinalize& operator=(tFinalize&) { } + const tFinalize& operator=(const tFinalize& f); + tFinalize(const tFinalize& f); } finalize(parseContext); // Initialize the flattening accumulation data, so we can track data across multiple bracket or -- 2.7.4