Commit bf688510 by John Kessenich

For portability, use std::map instead of std::hash_map in recent preprocessor fix.

parent 21a8770f
......@@ -80,8 +80,6 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../ParseHelper.h"
#include <hash_map>
namespace glslang {
class TPpToken {
......@@ -165,8 +163,8 @@ public:
};
MemoryPool *pool;
typedef std::hash_map<int, Symbol*> TSymbol;
TSymbol symbols; // this has light use... just defined macros
typedef std::map<int, Symbol*> 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<const TString, int> TAtomMap;
typedef std::map<const TString, int> TAtomMap;
typedef TVector<const TString*> TStringMap;
TAtomMap atomMap;
TStringMap stringMap;
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment