Disambiguate hash references.

25 files changed, 530 insertions, 4 deletions

diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo
index 3def2019601..506dd602da6 100644
--- a/games/criticalmass/distinfo
+++ b/games/criticalmass/distinfo
@@ -1,14 +1,37 @@
-$NetBSD: distinfo,v 1.10 2011/11/24 14:09:47 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/06/16 20:40:40 joerg Exp $
 
 SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b
 RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d
 Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes
 SHA1 (patch-aa) = a5caa2facea22cd5e7d208540626ed2163d81f18
+SHA1 (patch-game_BitmapManager.cpp) = 31265aeb2f97b642ca8d7f862de13e6442287a27
+SHA1 (patch-game_CallbackManager.cpp) = 6c5a7285397e52f3792420cc3bd775b6c0bd1c67
+SHA1 (patch-game_CallbackManager.hpp) = 8eb7c0830fe883b75e23c163d488dd1ef5e1980b
+SHA1 (patch-game_FontManager.cpp) = 13e99966beba8b27e9bd1de41859fb7c6745b111
+SHA1 (patch-game_Input.cpp) = a7b8587fc7a11879017a439e1a22b351c1819af2
+SHA1 (patch-game_Input.hpp) = 25cda998a93075d527f79938f27e2f7d70248125
+SHA1 (patch-game_ModelManager.cpp) = 5f2bd67348673aefb8fb2b45e8e899e9afbff2d7
+SHA1 (patch-game_ModelManager.hpp) = f12fdc00bc675480f39671dc0019637672b09814
+SHA1 (patch-game_ParticleGroup.cpp) = f027845125e3ea383976a3062f704a03d74865c4
+SHA1 (patch-game_ParticleGroup.hpp) = 97b7cf075ea4ca33bc55d69ba3b21f90bb2002a9
+SHA1 (patch-game_ParticleGroupManager.hpp) = f88c5fa653de8defa40e8de5ac4485307e317e0d
+SHA1 (patch-game_SampleManager.cpp) = e4b7178222d91d186b1dc104dbdb7c73082bb067
+SHA1 (patch-game_SelectableFactory.cpp) = 885893f1f5b7f9faddcdcb9723bea879c0241f7f
+SHA1 (patch-game_SelectableFactory.hpp) = 99fab8bf9857f3e5b298caf08e3752870801daf6
+SHA1 (patch-game_WeaponDepot.cpp) = bc58e929983e1db2597f58c76b8567274a864133
+SHA1 (patch-game_WeaponDepot.hpp) = 3e54c85932c9c1dec781b5a6c57f0c855b40854f
 SHA1 (patch-game_main.cpp) = 9dbf9b3de9de4ce97b0ed99ab4f4c983159124c0
 SHA1 (patch-tinyxml_tinyxml.cpp) = e25526fff0121795c1a54089b87ede52eb86f124
 SHA1 (patch-tinyxml_tinyxmlparser.cpp) = 236ff1cbd6fe83045df28022a6b02f9f65da4ee8
-SHA1 (patch-utils_ResourceManager.cpp) = a491869a5b6a99e281bb5de88c7c86ad5996fa00
+SHA1 (patch-tools_Packer.cpp) = 06f2ce956fd627ef2293c3650238996b3f800d4c
+SHA1 (patch-utils_Config.cpp) = 9f146ad01fbea62270a20c5f9ed5a1e70a6c60ce
+SHA1 (patch-utils_Config.hpp) = c2bdaceef30711421c0c77ad680d01cb062f16a9
+SHA1 (patch-utils_FindHash.hpp) = b98aac8e4008adeb51fa9c0d3a08d10b44633b4f
+SHA1 (patch-utils_ResourceCache.hpp) = e127f87ae94e6f9260f130bb22cdb92a8650d496
+SHA1 (patch-utils_ResourceManager.cpp) = 3234b06c4b5a448aba2e3902deaba501033af88f
+SHA1 (patch-utils_ResourceManager.hpp) = 8f29cfb3bf2aa1844f5987abddf854594b229f5c
 SHA1 (patch-utils_Value.hpp) = e5b6700167a6fc3dd1275cda4b17cab85d68d22d
 SHA1 (patch-utils_zStream.cpp) = b94b48862bbcfbdfbe84d7d1e6bf8133921d80aa
 SHA1 (patch-utils_zStreamBufferImplZLib.cpp) = ad7a4bc3d6a36274d2a71e0d6201b20461274b89
+SHA1 (patch-utilsgl_GLBitmapCollection.hpp) = dd94e5bc9c71ff3d05a475f10f4f30afb3cc91f7
 SHA1 (patch-utilssdl_PNG.cpp) = bf46226338a75c50c25f273f8b6cd956eb7d656c
diff --git a/games/criticalmass/patches/patch-game_BitmapManager.cpp b/games/criticalmass/patches/patch-game_BitmapManager.cpp
new file mode 100644
index 00000000000..6abfe7c8c66
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_BitmapManager.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_BitmapManager.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/BitmapManager.cpp.orig	2013-06-15 10:07:54.000000000 +0000
++++ game/BitmapManager.cpp
+@@ -29,7 +29,7 @@ BitmapManager::~BitmapManager()
+ void BitmapManager::reload( void)
+ {
+     XTRACE();
+-    hash_map< const string, GLBitmapCollection*, hash<const string> >::const_iterator ci;
++    hash_map< const string, GLBitmapCollection*, HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+     for( ci=_resourceMap.begin(); ci!=_resourceMap.end(); ci++)
+     {
+ 	GLBitmapCollection *bitmap = ci->second;
diff --git a/games/criticalmass/patches/patch-game_CallbackManager.cpp b/games/criticalmass/patches/patch-game_CallbackManager.cpp
new file mode 100644
index 00000000000..bd3bf7b39ec
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_CallbackManager.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_CallbackManager.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/CallbackManager.cpp.orig	2013-06-15 10:08:42.000000000 +0000
++++ game/CallbackManager.cpp
+@@ -27,7 +27,7 @@ CallbackManager::~CallbackManager()
+ {
+     XTRACE();
+ 
+-    hash_map< string, Callback*, hash<string> >::const_iterator ci;
++    hash_map< string, Callback*, HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     for( ci=_actionMap.begin(); ci!=_actionMap.end(); ci++)
+     {
+         delete ci->second;
diff --git a/games/criticalmass/patches/patch-game_CallbackManager.hpp b/games/criticalmass/patches/patch-game_CallbackManager.hpp
new file mode 100644
index 00000000000..195936fcb51
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_CallbackManager.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_CallbackManager.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/CallbackManager.hpp.orig	2013-06-15 10:06:55.000000000 +0000
++++ game/CallbackManager.hpp
+@@ -36,7 +36,7 @@ private:
+     CallbackManager( const CallbackManager&);
+     CallbackManager &operator=(const CallbackManager&);
+ 
+-    hash_map< string, Callback*, hash<string>, equal_to<string> > _actionMap;
++    hash_map< string, Callback*, HASH_NAMESPACE::hash<string>, equal_to<string> > _actionMap;
+ };
+ 
+ #endif
diff --git a/games/criticalmass/patches/patch-game_FontManager.cpp b/games/criticalmass/patches/patch-game_FontManager.cpp
new file mode 100644
index 00000000000..10094d78f44
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_FontManager.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_FontManager.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/FontManager.cpp.orig	2013-06-15 10:08:29.000000000 +0000
++++ game/FontManager.cpp
+@@ -28,7 +28,7 @@ FontManager::~FontManager()
+ void FontManager::reload( void)
+ {
+     XTRACE();
+-    hash_map< const string, GLBitmapFont*, hash<const string> >::const_iterator ci;
++    hash_map< const string, GLBitmapFont*, HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+     for( ci=_resourceMap.begin(); ci!=_resourceMap.end(); ci++)
+     {
+ 	GLBitmapFont *font = ci->second;
diff --git a/games/criticalmass/patches/patch-game_Input.cpp b/games/criticalmass/patches/patch-game_Input.cpp
new file mode 100644
index 00000000000..598bf47bc98
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_Input.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_Input.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/Input.cpp.orig	2013-06-15 10:08:31.000000000 +0000
++++ game/Input.cpp
+@@ -260,7 +260,7 @@ void Input::save( ofstream &outfile)
+     XTRACE();
+     outfile << "# --- Binding section --- " << endl;
+ 
+-    hash_map< Trigger, Callback*, hash<Trigger> >::const_iterator ci;
++    hash_map< Trigger, Callback*, HASH_NAMESPACE::hash<Trigger> >::const_iterator ci;
+     for( ci=_callbackMap.begin(); ci!=_callbackMap.end(); ci++)
+     {
+         outfile << "bind " 
diff --git a/games/criticalmass/patches/patch-game_Input.hpp b/games/criticalmass/patches/patch-game_Input.hpp
new file mode 100644
index 00000000000..671bcd020ed
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_Input.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_Input.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/Input.hpp.orig	2013-06-15 10:08:05.000000000 +0000
++++ game/Input.hpp
+@@ -104,7 +104,7 @@ private:
+     CallbackManager _callbackManager;
+     Keys _keys;
+ 
+-    hash_map< Trigger, Callback*, hash<Trigger>, equal_to<Trigger> > _callbackMap;
++    hash_map< Trigger, Callback*, HASH_NAMESPACE::hash<Trigger>, equal_to<Trigger> > _callbackMap;
+ 
+     //stuff for mouse smoothing
+     float _memoryDX;
diff --git a/games/criticalmass/patches/patch-game_ModelManager.cpp b/games/criticalmass/patches/patch-game_ModelManager.cpp
new file mode 100644
index 00000000000..2122c798e9a
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_ModelManager.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-game_ModelManager.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/ModelManager.cpp.orig	2013-06-15 10:08:34.000000000 +0000
++++ game/ModelManager.cpp
+@@ -26,7 +26,7 @@ ModelManager::~ModelManager()
+ {
+     XTRACE();
+ 
+-    hash_map< string, Model*, hash<string> >::const_iterator ci;
++    hash_map< string, Model*, HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     for( ci=_modelMap.begin(); ci!=_modelMap.end(); ci++)
+     {
+         delete ci->second;
+@@ -39,7 +39,7 @@ void ModelManager::reload( void)
+ {
+     XTRACE();
+ 
+-    hash_map< string, Model*, hash<string> >::const_iterator ci;
++    hash_map< string, Model*, HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     for( ci=_modelMap.begin(); ci!=_modelMap.end(); ci++)
+     {
+         ci->second->reload();
diff --git a/games/criticalmass/patches/patch-game_ModelManager.hpp b/games/criticalmass/patches/patch-game_ModelManager.hpp
new file mode 100644
index 00000000000..004ae287112
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_ModelManager.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_ModelManager.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/ModelManager.hpp.orig	2013-06-15 10:08:00.000000000 +0000
++++ game/ModelManager.hpp
+@@ -54,7 +54,7 @@ private:
+ 
+     Model *load( const string &model);
+ 
+-    hash_map< string, Model*, hash<string>, equal_to<string> > _modelMap;
++    hash_map< string, Model*, HASH_NAMESPACE::hash<string>, equal_to<string> > _modelMap;
+ };
+ 
+ typedef Singleton<ModelManager> ModelManagerS;
diff --git a/games/criticalmass/patches/patch-game_ParticleGroup.cpp b/games/criticalmass/patches/patch-game_ParticleGroup.cpp
new file mode 100644
index 00000000000..471f71feeca
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_ParticleGroup.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_ParticleGroup.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/ParticleGroup.cpp.orig	2013-06-15 10:08:37.000000000 +0000
++++ game/ParticleGroup.cpp
+@@ -17,7 +17,7 @@
+ #include <ParticleGroup.hpp>
+ #include <FindHash.hpp>
+ 
+-hash_map< const string, ParticleType*, hash<const string>, equal_to<const string> > 
++hash_map< const string, ParticleType*, HASH_NAMESPACE::hash<const string>, equal_to<const string> > 
+     ParticleGroup::_particleTypeMap;
+ 
+ ParticleGroup::ParticleGroup( const string &groupName, int numParticles):
diff --git a/games/criticalmass/patches/patch-game_ParticleGroup.hpp b/games/criticalmass/patches/patch-game_ParticleGroup.hpp
new file mode 100644
index 00000000000..417248399bd
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_ParticleGroup.hpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-game_ParticleGroup.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/ParticleGroup.hpp.orig	2013-06-15 10:04:38.000000000 +0000
++++ game/ParticleGroup.hpp
+@@ -86,7 +86,7 @@ public:
+ 
+     static void destroyParticleTypes( void)
+     {
+-	hash_map< const string, ParticleType*, hash<const string> >::const_iterator ci;
++	hash_map< const string, ParticleType*, HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+ 	for( ci=_particleTypeMap.begin(); ci!=_particleTypeMap.end(); ci++)
+ 	{
+ 	    //don't delete hero!
+@@ -104,7 +104,7 @@ private:
+ 
+     //All Particle manager share the particleTypeMap
+     static hash_map< 
+-        const string, ParticleType*, hash<const string>, equal_to<const string> > _particleTypeMap;
++        const string, ParticleType*, HASH_NAMESPACE::hash<const string>, equal_to<const string> > _particleTypeMap;
+ 
+     ParticleInfo *_particles;
+ 
diff --git a/games/criticalmass/patches/patch-game_ParticleGroupManager.hpp b/games/criticalmass/patches/patch-game_ParticleGroupManager.hpp
new file mode 100644
index 00000000000..b504542f870
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_ParticleGroupManager.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_ParticleGroupManager.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/ParticleGroupManager.hpp.orig	2013-06-15 10:08:18.000000000 +0000
++++ game/ParticleGroupManager.hpp
+@@ -47,7 +47,7 @@ private:
+     ParticleGroupManager &operator=(const ParticleGroupManager&);
+ 
+     hash_map< 
+-        const string, ParticleGroup*, hash<const string>, equal_to<const string> > _particleGroupMap;
++        const string, ParticleGroup*, HASH_NAMESPACE::hash<const string>, equal_to<const string> > _particleGroupMap;
+     list<ParticleGroup*> _particleGroupList;
+ 
+     struct LinkedParticleGroup
diff --git a/games/criticalmass/patches/patch-game_SampleManager.cpp b/games/criticalmass/patches/patch-game_SampleManager.cpp
new file mode 100644
index 00000000000..87ae0220307
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_SampleManager.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_SampleManager.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/SampleManager.cpp.orig	2013-06-15 10:07:57.000000000 +0000
++++ game/SampleManager.cpp
+@@ -30,7 +30,7 @@ SampleManager::~SampleManager()
+     //need to override base destructor behaviour, since we need
+     //to Mix_FreeChunk not delete.
+     
+-    hash_map< const string, Mix_Chunk*, hash<const string> >::const_iterator ci;
++    hash_map< const string, Mix_Chunk*, HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+     for( ci=_resourceMap.begin(); ci!=_resourceMap.end(); ci++)
+     {
+ 	Mix_Chunk *res = ci->second;
diff --git a/games/criticalmass/patches/patch-game_SelectableFactory.cpp b/games/criticalmass/patches/patch-game_SelectableFactory.cpp
new file mode 100644
index 00000000000..4069aa172a9
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_SelectableFactory.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-game_SelectableFactory.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/SelectableFactory.cpp.orig	2013-06-15 10:08:14.000000000 +0000
++++ game/SelectableFactory.cpp
+@@ -17,7 +17,7 @@
+ hash_map< 
+     const string, 
+     SelectableFactory*, 
+-    hash<const string>, equal_to<const string> > SelectableFactory::_sfMap;
++    HASH_NAMESPACE::hash<const string>, equal_to<const string> > SelectableFactory::_sfMap;
+ 
+ bool SelectableFactory::_initialized = false;
+ 
+@@ -44,7 +44,7 @@ void SelectableFactory::cleanup( void)
+ {
+     hash_map< const string, 
+               SelectableFactory*, 
+-	      hash<const string> >::const_iterator ci;
++	      HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+     for( ci=_sfMap.begin(); ci!=_sfMap.end(); ci++)
+     {
+ 	SelectableFactory *sf = ci->second;
diff --git a/games/criticalmass/patches/patch-game_SelectableFactory.hpp b/games/criticalmass/patches/patch-game_SelectableFactory.hpp
new file mode 100644
index 00000000000..73d10d15978
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_SelectableFactory.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_SelectableFactory.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/SelectableFactory.hpp.orig	2013-06-15 10:07:11.000000000 +0000
++++ game/SelectableFactory.hpp
+@@ -40,7 +40,7 @@ protected:
+     virtual ~SelectableFactory() {}
+ 
+     static hash_map< 
+-        const string, SelectableFactory*, hash<const string>, equal_to<const string> > _sfMap;
++        const string, SelectableFactory*, HASH_NAMESPACE::hash<const string>, equal_to<const string> > _sfMap;
+ 
+     void posToPoint2D( const string &pos, Point2D &point);
+     string getAttribute( const TiXmlElement* elem, string attr);
diff --git a/games/criticalmass/patches/patch-game_WeaponDepot.cpp b/games/criticalmass/patches/patch-game_WeaponDepot.cpp
new file mode 100644
index 00000000000..5f2965c9ccb
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_WeaponDepot.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_WeaponDepot.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/WeaponDepot.cpp.orig	2013-06-15 10:08:40.000000000 +0000
++++ game/WeaponDepot.cpp
+@@ -32,7 +32,7 @@ WeaponDepot::~WeaponDepot()
+ {
+     XTRACE();
+ 
+-    hash_map< string, Weapon*, hash<string> >::const_iterator ci;
++    hash_map< string, Weapon*, HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     for( ci=_weaponMap.begin(); ci!=_weaponMap.end(); ci++)
+     {
+         delete ci->second;
diff --git a/games/criticalmass/patches/patch-game_WeaponDepot.hpp b/games/criticalmass/patches/patch-game_WeaponDepot.hpp
new file mode 100644
index 00000000000..c129d1c3b6a
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_WeaponDepot.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-game_WeaponDepot.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- game/WeaponDepot.hpp.orig	2013-06-15 10:08:23.000000000 +0000
++++ game/WeaponDepot.hpp
+@@ -37,7 +37,7 @@ private:
+ 
+     void addWeapon( Weapon *weap);
+ 
+-    hash_map< string, Weapon*, hash<string>, equal_to<string> > _weaponMap;
++    hash_map< string, Weapon*, HASH_NAMESPACE::hash<string>, equal_to<string> > _weaponMap;
+ };
+ 
+ typedef Singleton<WeaponDepot> WeaponDepotS;
diff --git a/games/criticalmass/patches/patch-tools_Packer.cpp b/games/criticalmass/patches/patch-tools_Packer.cpp
new file mode 100644
index 00000000000..4410fb11985
--- /dev/null
+++ b/games/criticalmass/patches/patch-tools_Packer.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_Packer.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- tools/Packer.cpp.orig	2013-06-15 10:04:06.000000000 +0000
++++ tools/Packer.cpp
+@@ -21,7 +21,7 @@ const char RPATH_SEPERATOR = '/';
+ //OS dependent seperator
+ const char PATH_SEPERATOR = '/';
+ 
+-bool operator<( DirectoryEntry &de1, DirectoryEntry &de2)
++bool operator<( const DirectoryEntry &de1, const DirectoryEntry &de2)
+ {
+     return( de1.resourceName < de2.resourceName);
+ }
diff --git a/games/criticalmass/patches/patch-utils_Config.cpp b/games/criticalmass/patches/patch-utils_Config.cpp
new file mode 100644
index 00000000000..9186bce841f
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_Config.cpp
@@ -0,0 +1,100 @@
+$NetBSD: patch-utils_Config.cpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- utils/Config.cpp.orig	2013-04-30 12:13:38.000000000 +0000
++++ utils/Config.cpp
+@@ -42,7 +42,7 @@ Config::~Config()
+ {
+     XTRACE();
+ 
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     for( ci=_keyValueMap.begin(); ci!=_keyValueMap.end(); ci++)
+     {
+         delete ci->second;
+@@ -58,7 +58,7 @@ Config::~Config()
+ 
+ void Config::getConfigItemList( list<ConfigItem> &ciList)
+ {
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     for( ci=_keyValueMap.begin(); ci!=_keyValueMap.end(); ci++)
+     {
+ 	ConfigItem item;
+@@ -275,9 +275,9 @@ void Config::removeTrans( const string &
+ }
+ 
+ void Config::removeImpl( const string &keyword,
+-	hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap)
++	hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap)
+ {
+-    hash_map<string, Value*, hash<string> >::iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::iterator ci;
+     ci = kvmap.find( keyword);
+ 
+     if( ci!=kvmap.end())
+@@ -316,7 +316,7 @@ void Config::saveToFile( bool truncate)
+     outfile << "# This is a generated file. Edit carefully!" << endl;
+     outfile << "# --- Variable section --- " << endl;
+  
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     for( ci=_keyValueMap.begin(); ci!=_keyValueMap.end(); ci++)
+     {
+         Value *val = ci->second;
+@@ -378,9 +378,9 @@ bool Config::getFloat( const string &key
+ }
+ 
+ bool Config::getStringImpl( const string &keyword, string &value, 
+-	hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap)
++	hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap)
+ {
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     ci = kvmap.find( keyword);
+ 
+     if( ci!=kvmap.end())
+@@ -393,9 +393,9 @@ bool Config::getStringImpl( const string
+ }
+ 
+ bool Config::getIntegerImpl( const string &keyword, int &value, 
+-	hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap)
++	hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap)
+ {
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     ci = kvmap.find( keyword);
+ 
+     if( ci!=kvmap.end())
+@@ -408,9 +408,9 @@ bool Config::getIntegerImpl( const strin
+ }
+ 
+ bool Config::getBooleanImpl( const string &keyword, bool &value,
+-	hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap)
++	hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap)
+ {
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     ci = kvmap.find( keyword);
+ 
+     if( ci!=kvmap.end())
+@@ -423,9 +423,9 @@ bool Config::getBooleanImpl( const strin
+ }
+ 
+ bool Config::getFloatImpl( const string &keyword, float &value,
+-	hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap)
++	hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap)
+ {
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+     ci = kvmap.find( keyword);
+ 
+     if( ci!=kvmap.end())
+@@ -440,7 +440,7 @@ bool Config::getFloatImpl( const string 
+ void Config::dump( void)
+ {
+     XTRACE();
+-    hash_map<string, Value*, hash<string> >::const_iterator ci;
++    hash_map<string, Value*, ::HASH_NAMESPACE::hash<string> >::const_iterator ci;
+ 
+     for( ci=_keyValueMap.begin(); ci!=_keyValueMap.end(); ci++)
+     {
diff --git a/games/criticalmass/patches/patch-utils_Config.hpp b/games/criticalmass/patches/patch-utils_Config.hpp
new file mode 100644
index 00000000000..e55a1e93daf
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_Config.hpp
@@ -0,0 +1,35 @@
+$NetBSD: patch-utils_Config.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- utils/Config.hpp.orig	2013-04-30 12:11:40.000000000 +0000
++++ utils/Config.hpp
+@@ -91,23 +91,23 @@ private:
+     Config &operator=(const Config&);
+ 
+     void removeImpl( const string &keyword,
+-	    hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap);
++	    hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap);
+ 
+     bool getStringImpl( const string &keyword, string &value, 
+-	    hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap);
++	    hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap);
+     bool getIntegerImpl( const string &keyword, int &value, 
+-	    hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap);
++	    hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap);
+     bool getBooleanImpl( const string &keyword, bool &value,
+-	    hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap);
++	    hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap);
+     bool getFloatImpl( const string &keyword, float &value,
+-	    hash_map< string, Value*, hash<string>, equal_to<string> > &kvmap);
++	    hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > &kvmap);
+ 
+     string _defaultConfigFileName;
+     string _subdir;
+     string _configDirectory;
+     list<ConfigHandler*> _configHandlerList;
+-    hash_map< string, Value*, hash<string>, equal_to<string> > _keyValueMap;
+-    hash_map< string, Value*, hash<string>, equal_to<string> > _keyValueMapTrans;
++    hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > _keyValueMap;
++    hash_map< string, Value*, ::HASH_NAMESPACE::hash<string>, equal_to<string> > _keyValueMapTrans;
+ };
+ 
+ typedef Singleton<Config> ConfigS;
diff --git a/games/criticalmass/patches/patch-utils_FindHash.hpp b/games/criticalmass/patches/patch-utils_FindHash.hpp
new file mode 100644
index 00000000000..2092d1d9125
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_FindHash.hpp
@@ -0,0 +1,45 @@
+$NetBSD: patch-utils_FindHash.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+Incomplete.
+
+--- utils/FindHash.hpp.orig	2013-04-30 12:15:10.000000000 +0000
++++ utils/FindHash.hpp
+@@ -18,9 +18,9 @@
+ template< class _KeyT, class _ValT >
+ _ValT* findHash( 
+     _KeyT &trigger, 
+-    hash_map< _KeyT, _ValT*, hash<_KeyT>, equal_to<_KeyT> > & hashMap )
++    hash_map< _KeyT, _ValT*, ::HASH_NAMESPACE::hash<_KeyT>, equal_to<_KeyT> > & hashMap )
+ {
+-    typename hash_map< _KeyT, _ValT*, hash<_KeyT> >::const_iterator ci;
++    typename hash_map< _KeyT, _ValT*, ::HASH_NAMESPACE::hash<_KeyT> >::const_iterator ci;
+     ci = hashMap.find( trigger);
+     if( ci == hashMap.end())
+     {
+@@ -33,9 +33,24 @@ _ValT* findHash( 
+ template< class _KeyT, class _ValT >
+ _ValT* findHash( 
+     const _KeyT &trigger, 
+-    hash_map< _KeyT, _ValT*, hash<_KeyT>, equal_to<_KeyT> > & hashMap )
++    hash_map< _KeyT, _ValT*, ::HASH_NAMESPACE::hash<_KeyT>, equal_to<_KeyT> > & hashMap )
+ {
+-    typename hash_map< const _KeyT, _ValT*, hash<const _KeyT> >::const_iterator ci;
++    typename hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT> >::const_iterator ci;
++    ci = hashMap.find( trigger);
++    if( ci == hashMap.end())
++    {
++        return 0;
++    }
++
++    return ci->second;
++}
++
++template< class _KeyT, class _ValT >
++_ValT* findHash( 
++    const _KeyT &trigger, 
++    hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT>, equal_to<const _KeyT> > & hashMap )
++{
++    typename hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT> >::const_iterator ci;
+     ci = hashMap.find( trigger);
+     if( ci == hashMap.end())
+     {
diff --git a/games/criticalmass/patches/patch-utils_ResourceCache.hpp b/games/criticalmass/patches/patch-utils_ResourceCache.hpp
new file mode 100644
index 00000000000..f3a62b9ed05
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_ResourceCache.hpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-utils_ResourceCache.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- utils/ResourceCache.hpp.orig	2013-06-15 10:04:56.000000000 +0000
++++ utils/ResourceCache.hpp
+@@ -60,7 +60,7 @@ protected:
+     }
+     virtual ~ResourceCache()
+     {
+-	typename hash_map< const string, ResourceT*, hash<const string>, equal_to<const string> >::const_iterator ci;
++	typename hash_map< const string, ResourceT*, HASH_NAMESPACE::hash<const string>, equal_to<const string> >::const_iterator ci;
+ 	for( ci=_resourceMap.begin(); ci!=_resourceMap.end(); ci++)
+ 	{
+ 	    ResourceT *res = ci->second;
+@@ -70,7 +70,7 @@ protected:
+     }
+ 
+     virtual ResourceT *load( const string &resource) = 0;
+-    hash_map< const string, ResourceT*, hash<const string>, equal_to<const string> > _resourceMap;
++    hash_map< const string, ResourceT*, HASH_NAMESPACE::hash<const string>, equal_to<const string> > _resourceMap;
+ 
+ private:
+     ResourceCache( const ResourceCache&);
diff --git a/games/criticalmass/patches/patch-utils_ResourceManager.cpp b/games/criticalmass/patches/patch-utils_ResourceManager.cpp
index 88504569c60..813f6faf648 100644
--- a/games/criticalmass/patches/patch-utils_ResourceManager.cpp
+++ b/games/criticalmass/patches/patch-utils_ResourceManager.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-utils_ResourceManager.cpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
+$NetBSD: patch-utils_ResourceManager.cpp,v 1.2 2013/06/16 20:40:40 joerg Exp $
 
---- utils/ResourceManager.cpp.orig	2011-11-24 00:45:09.000000000 +0000
+--- utils/ResourceManager.cpp.orig	2005-01-02 02:59:29.000000000 +0000
 +++ utils/ResourceManager.cpp
 @@ -15,6 +15,7 @@
  #include <iomanip>
@@ -10,3 +10,30 @@ $NetBSD: patch-utils_ResourceManager.cpp,v 1.1 2011/11/24 14:09:47 joerg Exp $
  
  #include <Trace.hpp>
  #include <ResourceManager.hpp>
+@@ -31,7 +32,7 @@ const char PATH_SEPERATOR = '/';
+ //Destroy resource manager
+ ResourceManager::~ResourceManager()
+ {
+-    hash_map< const string, DirectoryEntry*, hash<const string> >::const_iterator ci;
++    hash_map< const string, DirectoryEntry*, HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+     for( ci=_dirEntryMap.begin(); ci!=_dirEntryMap.end(); ci++)
+     {
+         delete ci->second;
+@@ -285,7 +286,7 @@ ziStream &ResourceManager::getInputStrea
+ 
+ void ResourceManager::getResourceList( list<string> &rNameList)
+ {
+-    hash_map< const string, DirectoryEntry*, hash<const string> >::const_iterator ci;
++    hash_map< const string, DirectoryEntry*, HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+     for( ci=_dirEntryMap.begin(); ci!=_dirEntryMap.end(); ci++)
+     {
+         rNameList.insert( rNameList.end(), ci->second->resourceName);
+@@ -297,7 +298,7 @@ void ResourceManager::dump( void)
+     int totalOrig = 0;
+     int totalComp = 0;
+ 
+-    hash_map< const string, DirectoryEntry*, hash<const string> >::const_iterator ci;
++    hash_map< const string, DirectoryEntry*, HASH_NAMESPACE::hash<const string> >::const_iterator ci;
+     for( ci=_dirEntryMap.begin(); ci!=_dirEntryMap.end(); ci++)
+     {
+         DirectoryEntry &di = *(ci->second);
diff --git a/games/criticalmass/patches/patch-utils_ResourceManager.hpp b/games/criticalmass/patches/patch-utils_ResourceManager.hpp
new file mode 100644
index 00000000000..b6987d8d76a
--- /dev/null
+++ b/games/criticalmass/patches/patch-utils_ResourceManager.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-utils_ResourceManager.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- utils/ResourceManager.hpp.orig	2013-04-30 12:13:05.000000000 +0000
++++ utils/ResourceManager.hpp
+@@ -71,7 +71,7 @@ private:
+     string _openFilename;
+     ifstream _infile;
+     ziStream *_activeInput;
+-    hash_map< const string, DirectoryEntry*, hash<const string>, equal_to<const string> > _dirEntryMap;
++    hash_map<const string, DirectoryEntry*, ::HASH_NAMESPACE::hash<const string>, equal_to<const string> > _dirEntryMap;
+     string::size_type _baseLen;
+ };
+ 
diff --git a/games/criticalmass/patches/patch-utilsgl_GLBitmapCollection.hpp b/games/criticalmass/patches/patch-utilsgl_GLBitmapCollection.hpp
new file mode 100644
index 00000000000..b9b2a4e06cb
--- /dev/null
+++ b/games/criticalmass/patches/patch-utilsgl_GLBitmapCollection.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-utilsgl_GLBitmapCollection.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
+
+--- utilsgl/GLBitmapCollection.hpp.orig	2013-04-30 12:25:42.000000000 +0000
++++ utilsgl/GLBitmapCollection.hpp
+@@ -133,7 +133,7 @@ protected:
+     unsigned int _bitmapCount;
+     float _textureSize;
+ 
+-    hash_map< const string, BitmapInfo*, hash<const string>, equal_to<const string> > _bitmapInfoMap;
++    hash_map< const string, BitmapInfo*, ::HASH_NAMESPACE::hash<const string>, equal_to<const string> > _bitmapInfoMap;
+ 
+ private:
+     GLBitmapCollection( const GLBitmapCollection&);