From cfcb8367a128e992c5e99a370f6873c6e0a2fe20 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 24 Oct 2010 18:52:34 +0200
Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom

---
 code/nel/include/nel/misc/block_memory.h      | 2 ++
 code/nel/include/nel/misc/types_nl.h          | 6 ++++--
 code/nel/src/3d/driver/direct3d/stddirect3d.h | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/nel/include/nel/misc/block_memory.h b/code/nel/include/nel/misc/block_memory.h
index 606ff6c32..bdcf617e7 100644
--- a/code/nel/include/nel/misc/block_memory.h
+++ b/code/nel/include/nel/misc/block_memory.h
@@ -174,7 +174,9 @@ public:
 		_Mutex.enter();
 
 		if(NL3D_BlockMemoryAssertOnPurge)
+		{
 			nlassert(_NAllocatedElts==0);
+		}
 
 		while(_Blocks.begin()!=_Blocks.end())
 		{
diff --git a/code/nel/include/nel/misc/types_nl.h b/code/nel/include/nel/misc/types_nl.h
index f2e1c0e6f..313d410b3 100644
--- a/code/nel/include/nel/misc/types_nl.h
+++ b/code/nel/include/nel/misc/types_nl.h
@@ -283,11 +283,11 @@ typedef	uint64_t	uint64;
 typedef				int			sint;			// at least 32bits (depend of processor)
 typedef	unsigned	int			uint;			// at least 32bits (depend of processor)
 
-#if __SIZEOF_LONG__ == 8
+#ifdef _LP64
 #	define	NL_I64 "l"
 #else
 #	define	NL_I64 "ll"
-#endif // __SIZEOF_LONG__ == 8
+#endif // _LP64
 
 #endif // NL_OS_UNIX
 
@@ -307,6 +307,8 @@ typedef	unsigned	int			uint;			// at least 32bits (depend of processor)
 #	define CHashSet std::tr1::unordered_set
 #	define CHashMultiMap std::tr1::unordered_multimap
 #elif defined(NL_COMP_VC7) || defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) // VC7 through 9
+#	include <hash_map>
+#	include <hash_set>
 #	define CHashMap stdext::hash_map
 #	define CHashSet stdext::hash_set
 #	define CHashMultiMap stdext::hash_multimap
diff --git a/code/nel/src/3d/driver/direct3d/stddirect3d.h b/code/nel/src/3d/driver/direct3d/stddirect3d.h
index 77551d0f2..07bffc93e 100644
--- a/code/nel/src/3d/driver/direct3d/stddirect3d.h
+++ b/code/nel/src/3d/driver/direct3d/stddirect3d.h
@@ -38,6 +38,7 @@
 #include <exception>
 #include <utility>
 #include <deque>
+#include <limits>
 
 
 #ifdef NL_DEBUG