Avoid the "deprecated or antiquated header" warning from g++ 4.3 by using <tr1/unorde...

[synfig.git] / synfig-core / trunk / src / synfig / guid.cpp

diff --git a/synfig-core/trunk/src/synfig/guid.cpp b/synfig-core/trunk/src/synfig/guid.cpp
index 1369aba..4598c63 100644 (file)
--- a/synfig-core/trunk/src/synfig/guid.cpp
+++ b/synfig-core/trunk/src/synfig/guid.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -22,7 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define HASH_MAP_H <ext/hash_map>
 #define SUBTRACT_RNG_H <ext/functional>
 
 #ifdef USING_PCH
@@ -47,7 +47,6 @@
 
 #ifdef HASH_MAP_H
 #include HASH_MAP_H
-using namespace __gnu_cxx;
 #endif
 
 #ifdef SUBTRACT_RNG_H
@@ -91,7 +90,7 @@ static void (*get_rand_long_long)(uint64_t&)=_set_up_rand_long_long;
 static void _set_up_rand_long_long(uint64_t &x)
 {
 #ifdef _DEBUG
-       synfig::info("Starting up GUID system...");
+       // synfig::info("Starting up GUID system...");
 #endif
        _a=GUID_RNG(time(0)+clock());
        _b=GUID_RNG(clock());
@@ -129,7 +128,7 @@ static void (*get_rand_long_long)(uint64_t&)=_set_up_rand_long_long;
 static void _set_up_rand_long_long(uint64_t &x)
 {
 #ifdef _DEBUG
-       synfig::info("Starting up GUID system...");
+       // synfig::info("Starting up GUID system...");
 #endif
        rand_fd=open("/dev/urandom",O_RDONLY);
        get_rand_long_long=_get_rand_long_long;
@@ -154,7 +153,7 @@ synfig::GUID
 synfig::GUID::hasher(const String& str)
 {
 #ifdef HASH_MAP_H
-       hash<const char*> string_hash_;
+       HASH_MAP_NAMESPACE::hash<const char*> string_hash_;
        const unsigned int seed(
                string_hash_(
                        str.c_str()