Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
2b3442ad
Commit
2b3442ad
authored
Jul 24, 2015
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Portability: Make previous merge work with MSVS 2012.
parent
b159bd58
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
ShaderLang.cpp
glslang/MachineIndependent/ShaderLang.cpp
+5
-5
No files found.
glslang/MachineIndependent/ShaderLang.cpp
View file @
2b3442ad
...
@@ -606,9 +606,9 @@ class SourceLineSynchronizer {
...
@@ -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:
...
@@ -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,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment