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

Portability: Make previous merge work with MSVS 2012.

Browse Source
This commit is contained in:
John Kessenich 2015-07-24 15:15:55 -06:00
parent b159bd5821
commit 2b3442ada1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glslang/MachineIndependent/ShaderLang.cpp
View File

@ -606,9 +606,9 @@ class SourceLineSynchronizer {
public: public:
SourceLineSynchronizer(const std::function<int()>& lastSourceIndex, SourceLineSynchronizer(const std::function<int()>& lastSourceIndex,
std::stringstream* output) std::stringstream* output)
: getLastSourceIndex(lastSourceIndex), output(output) {} : getLastSourceIndex(lastSourceIndex), output(output), lastSource(-1), lastLine(0) {}
SourceLineSynchronizer(const SourceLineSynchronizer&) = delete; // SourceLineSynchronizer(const SourceLineSynchronizer&) = delete;
SourceLineSynchronizer& operator=(const SourceLineSynchronizer&) = delete; // SourceLineSynchronizer& operator=(const SourceLineSynchronizer&) = delete;
// Sets the internally tracked source string index to that of the most // Sets the internally tracked source string index to that of the most
// recently read token. If we switched to a new source string, returns // 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 // 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 // source string starts. -1 means we haven't started processing any source
// string. // string.
int lastSource = -1; int lastSource;
// lastLine is the line number (starting from 1) of the last token processed. // 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 // 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 // on a new line. 0 means we haven't started processing any line in the
// current source string. // current source string.
int lastLine = 0; int lastLine;
}; };
// DoPreprocessing is a valid ProcessingContext template argument, // DoPreprocessing is a valid ProcessingContext template argument,