From 2b3442ada1c1ff9e64abba1734b9d871fb5dd0a0 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 24 Jul 2015 15:15:55 -0600 Subject: [PATCH] Portability: Make previous merge work with MSVS 2012. --- glslang/MachineIndependent/ShaderLang.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index 3cc26a4c..780f3ccc 100644 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -606,9 +606,9 @@ class SourceLineSynchronizer { public: SourceLineSynchronizer(const std::function& lastSourceIndex, std::stringstream* output) - : getLastSourceIndex(lastSourceIndex), output(output) {} - SourceLineSynchronizer(const SourceLineSynchronizer&) = delete; - SourceLineSynchronizer& operator=(const SourceLineSynchronizer&) = delete; + : getLastSourceIndex(lastSourceIndex), output(output), lastSource(-1), lastLine(0) {} +// SourceLineSynchronizer(const SourceLineSynchronizer&) = delete; +// SourceLineSynchronizer& operator=(const SourceLineSynchronizer&) = delete; // Sets the internally tracked source string index to that of the most // recently read token. If we switched to a new source string, returns @@ -653,12 +653,12 @@ private: // processed. It is tracked in order for newlines to be inserted when a new // source string starts. -1 means we haven't started processing any source // string. - int lastSource = -1; + int lastSource; // lastLine is the line number (starting from 1) of the last token processed. // It is tracked in order for newlines to be inserted when a token appears // on a new line. 0 means we haven't started processing any line in the // current source string. - int lastLine = 0; + int lastLine; }; // DoPreprocessing is a valid ProcessingContext template argument,