X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fguid.cpp;h=4598c635dbd983c2ae93b28e7c434b0641f4c590;hb=392b62fa87099d8576a9da614be431a5046fe595;hp=db0e149844acf158093b5065c2066d8f4e834b95;hpb=c3bae02cfef2b73f35385846da504ac011c5722a;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/guid.cpp b/synfig-core/trunk/src/synfig/guid.cpp index db0e149..4598c63 100644 --- a/synfig-core/trunk/src/synfig/guid.cpp +++ b/synfig-core/trunk/src/synfig/guid.cpp @@ -23,7 +23,6 @@ /* === H E A D E R S ======================================================= */ -#define HASH_MAP_H #define SUBTRACT_RNG_H #ifdef USING_PCH @@ -48,7 +47,6 @@ #ifdef HASH_MAP_H #include HASH_MAP_H -using namespace __gnu_cxx; #endif #ifdef SUBTRACT_RNG_H @@ -155,7 +153,7 @@ synfig::GUID synfig::GUID::hasher(const String& str) { #ifdef HASH_MAP_H - hash string_hash_; + HASH_MAP_NAMESPACE::hash string_hash_; const unsigned int seed( string_hash_( str.c_str()