diff --git a/glslang/MachineIndependent/preprocessor/PpContext.h b/glslang/MachineIndependent/preprocessor/PpContext.h index 4d267151..b19d8141 100644 --- a/glslang/MachineIndependent/preprocessor/PpContext.h +++ b/glslang/MachineIndependent/preprocessor/PpContext.h @@ -80,8 +80,6 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../ParseHelper.h" -#include - namespace glslang { class TPpToken { @@ -165,8 +163,8 @@ public: }; MemoryPool *pool; - typedef std::hash_map TSymbol; - TSymbol symbols; // this has light use... just defined macros + typedef std::map TSymbolMap; + TSymbolMap symbols; // this has light use... just defined macros protected: char* preamble; // string to parse, all before line 1 of string 0, it is 0 if no preamble @@ -304,7 +302,7 @@ protected: // // From PpAtom.cpp // - typedef std::hash_map TAtomMap; + typedef std::map TAtomMap; typedef TVector TStringMap; TAtomMap atomMap; TStringMap stringMap; diff --git a/glslang/MachineIndependent/preprocessor/PpSymbols.cpp b/glslang/MachineIndependent/preprocessor/PpSymbols.cpp index 076b346d..590c186e 100644 --- a/glslang/MachineIndependent/preprocessor/PpSymbols.cpp +++ b/glslang/MachineIndependent/preprocessor/PpSymbols.cpp @@ -125,7 +125,7 @@ TPpContext::Symbol* TPpContext::AddSymbol(int atom) TPpContext::Symbol* TPpContext::LookUpSymbol(int atom) { - TSymbol::iterator it = symbols.find(atom); + TSymbolMap::iterator it = symbols.find(atom); if (it == symbols.end()) return 0; else