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

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

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23632 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-10-21 19:50:14 +00:00
parent 21a8770f92
commit bf688510a8
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,8 +80,6 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../ParseHelper.h" #include "../ParseHelper.h"
#include <hash_map>
namespace glslang { namespace glslang {
class TPpToken { class TPpToken {
@ -165,8 +163,8 @@ public:
}; };
MemoryPool *pool; MemoryPool *pool;
typedef std::hash_map<int, Symbol*> TSymbol; typedef std::map<int, Symbol*> TSymbolMap;
TSymbol symbols; // this has light use... just defined macros TSymbolMap symbols; // this has light use... just defined macros
protected: protected:
char* preamble; // string to parse, all before line 1 of string 0, it is 0 if no preamble 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 // From PpAtom.cpp
// //
typedef std::hash_map<const TString, int> TAtomMap; typedef std::map<const TString, int> TAtomMap;
typedef TVector<const TString*> TStringMap; typedef TVector<const TString*> TStringMap;
TAtomMap atomMap; TAtomMap atomMap;
TStringMap stringMap; TStringMap stringMap;

2
glslang/MachineIndependent/preprocessor/PpSymbols.cpp
View File

@ -125,7 +125,7 @@ TPpContext::Symbol* TPpContext::AddSymbol(int atom)
TPpContext::Symbol* TPpContext::LookUpSymbol(int atom) TPpContext::Symbol* TPpContext::LookUpSymbol(int atom)
{ {
TSymbol::iterator it = symbols.find(atom); TSymbolMap::iterator it = symbols.find(atom);
if (it == symbols.end()) if (it == symbols.end())
return 0; return 0;
else else