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

Merge pull request #50 from google/remove-unused-code

Browse Source 
Remove unused members from TPpContext
This commit is contained in:
John Kessenich 2015-08-05 12:07:48 -06:00
commit 0718e45c24
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glslang/MachineIndependent/preprocessor/Pp.cpp
View File

@ -551,8 +551,7 @@ int TPpContext::CPPif(TPpToken* ppToken)
{ {
int token = scanToken(ppToken); int token = scanToken(ppToken);
elsetracker++; elsetracker++;
if (! ifdepth++) ifdepth++;
ifloc = ppToken->loc;
if (ifdepth > maxIfNesting) { if (ifdepth > maxIfNesting) {
parseContext.ppError(ppToken->loc, "maximum nesting depth exceeded", "#if", ""); parseContext.ppError(ppToken->loc, "maximum nesting depth exceeded", "#if", "");
return 0; return 0;

3
glslang/MachineIndependent/preprocessor/PpContext.h
View File

@ -237,7 +237,6 @@ protected:
int ifdepth; // current #if-#else-#endif nesting in the cpp.c file (pre-processor) int ifdepth; // current #if-#else-#endif nesting in the cpp.c file (pre-processor)
bool elseSeen[maxIfNesting]; // Keep a track of whether an else has been seen at a particular depth bool elseSeen[maxIfNesting]; // Keep a track of whether an else has been seen at a particular depth
int elsetracker; // #if-#else and #endif constructs...Counter. int elsetracker; // #if-#else and #endif constructs...Counter.
const char* ErrMsg;
class tMacroInput : public tInput { class tMacroInput : public tInput {
public: public:
@ -286,7 +285,7 @@ protected:
// //
// from Pp.cpp // from Pp.cpp
// //
TSourceLoc ifloc; /* outermost #if */
// Used to obtain #include content. // Used to obtain #include content.
const TShader::Includer& includer; const TShader::Includer& includer;