diff --git a/code/nel/include/nel/gui/lua_object.h b/code/nel/include/nel/gui/lua_object.h
index 1564df080..2360f1609 100644
--- a/code/nel/include/nel/gui/lua_object.h
+++ b/code/nel/include/nel/gui/lua_object.h
@@ -285,8 +285,7 @@ namespace NLGUI
 	class CLuaHashMapTraits
 	{
 	public:
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		CLuaHashMapTraits()
 		{}
 
diff --git a/code/nel/include/nel/misc/class_id.h b/code/nel/include/nel/misc/class_id.h
index 0628e8030..d02fc5646 100644
--- a/code/nel/include/nel/misc/class_id.h
+++ b/code/nel/include/nel/misc/class_id.h
@@ -61,8 +61,7 @@ public:
 class CClassIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const CClassId& classId ) const
 	{
 		return ((((uint64)classId >> 32)|0xFFFFFFFF) ^ (((uint64)classId|0xFFFFFFFF) & 0xFFFFFFFF));
diff --git a/code/nel/include/nel/misc/entity_id.h b/code/nel/include/nel/misc/entity_id.h
index 027fe28c7..b4e40909e 100644
--- a/code/nel/include/nel/misc/entity_id.h
+++ b/code/nel/include/nel/misc/entity_id.h
@@ -575,8 +575,7 @@ public:
 // Traits for hash_map using CEntityId
 struct CEntityIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CEntityIdHashMapTraits() { }
 	size_t operator() (const NLMISC::CEntityId &id ) const
 	{
diff --git a/code/nel/include/nel/misc/sheet_id.h b/code/nel/include/nel/misc/sheet_id.h
index 869a61af6..b11e97188 100644
--- a/code/nel/include/nel/misc/sheet_id.h
+++ b/code/nel/include/nel/misc/sheet_id.h
@@ -248,8 +248,7 @@ private :
 class CSheetIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const CSheetId& sheetId ) const
 	{
 		return sheetId.asInt() >> 5;
diff --git a/code/nel/include/nel/misc/string_mapper.h b/code/nel/include/nel/misc/string_mapper.h
index 36a73ed4d..1f62dd123 100644
--- a/code/nel/include/nel/misc/string_mapper.h
+++ b/code/nel/include/nel/misc/string_mapper.h
@@ -39,8 +39,7 @@ typedef	const std::string *TStringId;
 // Traits for hash_map using CStringId
 struct CStringIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CStringIdHashMapTraits() { }
 	size_t operator() (const NLMISC::TStringId &stringId) const
 	{
diff --git a/code/nel/include/nel/misc/ucstring.h b/code/nel/include/nel/misc/ucstring.h
index e6d7544b1..88e599c1a 100644
--- a/code/nel/include/nel/misc/ucstring.h
+++ b/code/nel/include/nel/misc/ucstring.h
@@ -355,8 +355,7 @@ namespace NLMISC
 // Traits for hash_map using CEntityId
 struct CUCStringHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CUCStringHashMapTraits() { }
 	size_t operator() (const ucstring &id ) const
 	{
diff --git a/code/nel/include/nel/sound/containers.h b/code/nel/include/nel/sound/containers.h
index 63e134077..57387e91e 100644
--- a/code/nel/include/nel/sound/containers.h
+++ b/code/nel/include/nel/sound/containers.h
@@ -42,8 +42,7 @@ namespace NLSOUND {
 template <class Pointer>
 struct THashPtr : public std::unary_function<const Pointer &, size_t>
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	size_t operator () (const Pointer &ptr) const
 	{
 		//CHashSet<uint>::hasher	h;
diff --git a/code/nel/include/nel/sound/context_sound.h b/code/nel/include/nel/sound/context_sound.h
index 13683ac56..8424ee087 100644
--- a/code/nel/include/nel/sound/context_sound.h
+++ b/code/nel/include/nel/sound/context_sound.h
@@ -82,8 +82,7 @@ struct CContextMatcher
 
 	struct CHash : public std::unary_function<CContextMatcher, size_t>
 	{
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t operator () (const CContextMatcher &patternMatcher) const
 		{
 			return patternMatcher.getHashValue();
diff --git a/code/nel/samples/net/udp/bench_service.cpp b/code/nel/samples/net/udp/bench_service.cpp
index 981a0dd0a..190347d4b 100644
--- a/code/nel/samples/net/udp/bench_service.cpp
+++ b/code/nel/samples/net/udp/bench_service.cpp
@@ -98,8 +98,7 @@ struct CClient
 
 struct TInetAddressHash
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 
 	inline bool operator() (const NLNET::CInetAddress &x1, const NLNET::CInetAddress &x2) const
 	{
diff --git a/code/nel/tools/pacs/build_rbank/build_surf.cpp b/code/nel/tools/pacs/build_rbank/build_surf.cpp
index 9546e19f1..10d4c6a19 100644
--- a/code/nel/tools/pacs/build_rbank/build_surf.cpp
+++ b/code/nel/tools/pacs/build_rbank/build_surf.cpp
@@ -201,8 +201,7 @@ template<class A>
 class CHashPtr
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 
 	typedef	A	*ptrA;
 	size_t	operator() (const ptrA &a) const
diff --git a/code/ryzom/client/src/actions.h b/code/ryzom/client/src/actions.h
index cdc3f200a..b177c1818 100644
--- a/code/ryzom/client/src/actions.h
+++ b/code/ryzom/client/src/actions.h
@@ -281,8 +281,7 @@ public:
 // HashMapTraits for NLMISC::TKey
 struct CTKeyHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CTKeyHashMapTraits() { }
 	size_t operator() (NLMISC::TKey key) const
 	{
diff --git a/code/ryzom/client/src/network_connection.h b/code/ryzom/client/src/network_connection.h
index 3eb5cd95b..da47f925e 100644
--- a/code/ryzom/client/src/network_connection.h
+++ b/code/ryzom/client/src/network_connection.h
@@ -776,16 +776,10 @@ protected:
 
 	/// @name NLMISC::CEntityId handling (for gamedev)
 	//@{
-	class CHash
+	struct CHash
 	{
-	public:
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
-
-		CHash() {}
-
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t	operator () (const CLFECOMMON::TSheetId &id) const { return id; }
-
 		inline bool operator() (const CLFECOMMON::TSheetId &id1, const CLFECOMMON::TSheetId &id2) const { return (size_t)id1 < (size_t)id2; }
 	};
 
diff --git a/code/ryzom/common/src/game_share/base_types.h b/code/ryzom/common/src/game_share/base_types.h
index 250e5f5e4..5330537b7 100644
--- a/code/ryzom/common/src/game_share/base_types.h
+++ b/code/ryzom/common/src/game_share/base_types.h
@@ -238,8 +238,7 @@ public:
 
 		CHashCode() {}
 
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 
 		size_t	operator () ( const TDataSetRow &index ) const { return index.getHashCode(); }
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h b/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h
index ec8e8041f..7603c92e9 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/db_string_updater.h
@@ -53,8 +53,7 @@ class CDBStringUpdater : public NLMISC::CSingleton<CDBStringUpdater>
 	// hasher for the identifier
 	struct THashDBStringLeaf
 	{
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t operator()(const TBDStringLeaf &stringLeaf) const
 		{
 			return ((size_t)stringLeaf.ClientDB>>4) ^ ((size_t)stringLeaf.Node>>4);
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
index 9f159fd01..ba0d1c306 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
@@ -50,8 +50,7 @@ extern CGenericXmlMsgHeaderManager	GenericMsgManager;
 
 struct CServiceIdHash
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	size_t	operator () ( const NLNET::TServiceId &sid ) const { return sid.get(); }
 };
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h b/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h
index a76e9656a..3e5de3130 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager_interface.h
@@ -43,8 +43,7 @@ public:
 
 	struct CUint32Hash
 	{
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t	operator () ( const uint32 &i ) const { return i; }
 	};
 
diff --git a/code/ryzom/server/src/frontend_service/client_entity_id_translator.h b/code/ryzom/server/src/frontend_service/client_entity_id_translator.h
index f6b79e42d..957774f39 100644
--- a/code/ryzom/server/src/frontend_service/client_entity_id_translator.h
+++ b/code/ryzom/server/src/frontend_service/client_entity_id_translator.h
@@ -91,8 +91,7 @@ private:
 
 	struct CHash
 	{
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t	operator () ( const TEntityIndex& index ) const { return index.getIndex(); }
 	};
 
diff --git a/code/ryzom/server/src/frontend_service/client_id_lookup.h b/code/ryzom/server/src/frontend_service/client_id_lookup.h
index 3d6db560e..9db039a12 100644
--- a/code/ryzom/server/src/frontend_service/client_id_lookup.h
+++ b/code/ryzom/server/src/frontend_service/client_id_lookup.h
@@ -114,10 +114,9 @@ private:
 
 	typedef std::vector<TClientId> TEntityIndexToClient;
 
-	class CIdHash
+	struct CIdHash
 	{
-	public:
-
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t	operator () ( NLMISC::CEntityId id ) const { return (uint32)id.getShortId(); }
 	};
 
diff --git a/code/ryzom/server/src/frontend_service/fe_types.h b/code/ryzom/server/src/frontend_service/fe_types.h
index 747fd6f9e..08a12eb5a 100644
--- a/code/ryzom/server/src/frontend_service/fe_types.h
+++ b/code/ryzom/server/src/frontend_service/fe_types.h
@@ -69,11 +69,9 @@ typedef uint32 TUid;
 /**
  * CInetAddress hash function
  */
-class CInetAddressHashMapTraits
+struct CInetAddressHashMapTraits
 {
-public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const NLNET::CInetAddress& x ) const
 	{
 		//return x.port();
diff --git a/code/ryzom/server/src/gpm_service/world_position_manager.cpp b/code/ryzom/server/src/gpm_service/world_position_manager.cpp
index 2c10878a6..9674541fc 100644
--- a/code/ryzom/server/src/gpm_service/world_position_manager.cpp
+++ b/code/ryzom/server/src/gpm_service/world_position_manager.cpp
@@ -504,7 +504,7 @@ void	CWorldPositionManager::triggerSubscribe(NLNET::TServiceId serviceId, const
 	STOP_IF(IsRingShard,"Illegal use of CWorldPositionManager on ring shard");
 	if (_PatatSubscribeManager.exist(name))
 	{
-		_PatatSubscribeManager.subscribe(serviceId, make_pair<string,uint16>(name, id));
+		_PatatSubscribeManager.subscribe(serviceId, std::pair<string,uint16>(name, id));
 	}
 }
 
@@ -2113,7 +2113,7 @@ void CWorldPositionManager::movePlayer(CWorldEntity *entity, sint32 x, sint32 y,
 	{
 		if (entity->PlayerInfos->DistanceHistory.size() >= 20)
 			entity->PlayerInfos->DistanceHistory.pop_back();
-		entity->PlayerInfos->DistanceHistory.push_front(make_pair<CVectorD,	uint>(CVectorD(x*0.001, y*0.001, z*0.001), tick));
+		entity->PlayerInfos->DistanceHistory.push_front(std::pair<CVectorD, uint>(CVectorD(x*0.001, y*0.001, z*0.001), tick));
 	}
 #endif
 
@@ -3227,7 +3227,7 @@ void	CWorldPositionManager::visionRequest(sint32 x, sint32 y, sint32 range, vect
 		if (abs(x - entity->X) < range && abs(y - entity->Y) < range &&
 			(rrange = sqrt(sqr((x - entity->X)*0.001) + sqr((y - entity->Y)*0.001))) < frange)
 		{
-			entities.push_back(make_pair<CEntityId, sint32>(entity->Id, (sint32)(rrange*1000)));
+			entities.push_back(std::pair<CEntityId, sint32>(entity->Id, (sint32)(rrange * 1000)));
 		}
 	}
 
@@ -3240,7 +3240,7 @@ void	CWorldPositionManager::visionRequest(sint32 x, sint32 y, sint32 range, vect
 		if (abs(x - entity->X) < range && abs(y - entity->Y) < range &&
 			(rrange = sqrt(sqr((x - entity->X)*0.001) + sqr((y - entity->Y)*0.001))) < frange)
 		{
-			entities.push_back(make_pair<CEntityId, sint32>(entity->Id, (sint32)(rrange*1000)));
+			entities.push_back(std::pair<CEntityId, sint32>(entity->Id, (sint32)(rrange * 1000)));
 		}
 	}
 }
diff --git a/code/ryzom/server/src/gpm_service/world_position_manager.h b/code/ryzom/server/src/gpm_service/world_position_manager.h
index f3a285a2e..18645d8ca 100644
--- a/code/ryzom/server/src/gpm_service/world_position_manager.h
+++ b/code/ryzom/server/src/gpm_service/world_position_manager.h
@@ -139,8 +139,7 @@ public:
 
 	struct CEntityIdHash
 	{
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t	operator () ( const NLMISC::CEntityId &id ) const { return (uint32)id.getShortId(); }
 	};
 
diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
index 0cbfbf595..2aa3c896b 100644
--- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
+++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
@@ -1356,7 +1356,7 @@ void	CStringManager::mergeEntityWords(CEntityWords& dest, const CEntityWords& so
 	std::map<std::string, uint32>::const_iterator	iti;
 	for (iti=source._ColumnInfo.begin(); iti!=source._ColumnInfo.end(); ++iti)
 		if (dest._ColumnInfo.find((*iti).first) == dest._ColumnInfo.end())
-			extraColumns.push_back(std::make_pair<std::string, uint32>((*iti).first, osz+(uint32)extraColumns.size()));
+			extraColumns.push_back(std::pair<std::string, uint32>((*iti).first, osz + (uint32)extraColumns.size()));
 
 	for (iti=source._RowInfo.begin(); iti!=source._RowInfo.end(); ++iti)
 		if (dest._RowInfo.find((*iti).first) == dest._RowInfo.end())
diff --git a/code/ryzom/server/src/monitor_service/client.cpp b/code/ryzom/server/src/monitor_service/client.cpp
index 6d761ba3e..ce2fdc5dc 100644
--- a/code/ryzom/server/src/monitor_service/client.cpp
+++ b/code/ryzom/server/src/monitor_service/client.cpp
@@ -273,7 +273,7 @@ void CMonitorClient::update ()
 		TYPE_NAME_STRING_ID id = Str[i];
 		std::map<TYPE_NAME_STRING_ID, std::string>::iterator ite = StringMap.find (id);
 		nlassert (ite != StringMap.end());
-		strToSend.push_back( make_pair<TYPE_NAME_STRING_ID, string*>(id, &((*ite).second)) );
+		strToSend.push_back(std::pair<TYPE_NAME_STRING_ID, string*>(id, &((*ite).second)));
 		strTotalSize += 4+4+(uint)(*ite).second.size();
 	}
 
diff --git a/code/ryzom/server/src/pd_lib/pd_utils.h b/code/ryzom/server/src/pd_lib/pd_utils.h
index e6dbb15fc..85a183753 100644
--- a/code/ryzom/server/src/pd_lib/pd_utils.h
+++ b/code/ryzom/server/src/pd_lib/pd_utils.h
@@ -490,8 +490,7 @@ typedef std::vector<CObjectIndex>		TIndexList;
 
 struct CColumnIndexHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CColumnIndexHashMapTraits() { }
 	size_t operator() (const CColumnIndex &id) const
 	{