(glslang) Cleanups

Author: LibretroAdmin

deps/glslang/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp

@@ -1173,22 +1173,22 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
     case PpAtomLineMacro:
         ppToken->ival = _parseContext.getCurrentLoc().line;
         snprintf(ppToken->name, sizeof(ppToken->name), "%d", ppToken->ival);
-        UngetToken(PpAtomConstInt, ppToken);
+	pushInput(new tUngotTokenInput(this, PpAtomConstInt, ppToken));
         return 1;
 
     case PpAtomFileMacro: {
         if (_parseContext.getCurrentLoc().name)
             _parseContext.ppRequireExtensions(ppToken->loc, 1, &E_GL_GOOGLE_cpp_style_line_directive, "filename-based __FILE__");
         ppToken->ival = _parseContext.getCurrentLoc().string;
         strlcpy(ppToken->name, ppToken->loc.getStringNameOrNum().c_str(), sizeof(ppToken->name));
-        UngetToken(PpAtomConstInt, ppToken);
+	pushInput(new tUngotTokenInput(this, PpAtomConstInt, ppToken));
         return 1;
     }
 
     case PpAtomVersionMacro:
         ppToken->ival = _parseContext.version;
         snprintf(ppToken->name, sizeof(ppToken->name), "%d", ppToken->ival);
-        UngetToken(PpAtomConstInt, ppToken);
+	pushInput(new tUngotTokenInput(this, PpAtomConstInt, ppToken));
         return 1;
 
     default:
@@ -1223,7 +1223,7 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
                 token = scanToken(ppToken);
         }
         if (token != '(') {
-            UngetToken(token, ppToken);
+	    pushInput(new tUngotTokenInput(this, token, ppToken));
             delete in;
             return 0;
         }

deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpContext.h

@@ -406,7 +406,6 @@ class TPpContext {
     // From PpTokens.cpp
     //
     void pushTokenStreamInput(TokenStream&, bool pasting = false);
-    void UngetToken(int token, TPpToken*);
 
     class tTokenInput : public tInput {
     public:

deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp

@@ -83,11 +83,6 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
 #endif
-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/)
-#ifndef snprintf
-#define snprintf sprintf_s
-#endif
-#endif
 
 #include <cstdlib>
 #include <cstring>
@@ -163,8 +158,7 @@ int TPpContext::TokenStream::getSubtoken()
 {
     if (current < data.size())
         return data[current++];
-    else
-        return EndOfInput;
+    return EndOfInput;
 }
 
 // back up one position in the stream
@@ -347,9 +341,4 @@ int TPpContext::tUngotTokenInput::scan(TPpToken* ppToken)
     return ret;
 }
 
-void TPpContext::UngetToken(int token, TPpToken* ppToken)
-{
-    pushInput(new tUngotTokenInput(this, token, ppToken));
-}
-
 } // end namespace glslang