aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-14 11:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-10-24 18:52:34 +02:00
parent 62992b0c9a
commit 090a8159a7
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/block_memory.h
View file

@ -174,7 +174,9 @@ public:
_Mutex.enter(); _Mutex.enter();
if(NL3D_BlockMemoryAssertOnPurge) if(NL3D_BlockMemoryAssertOnPurge)
{
nlassert(_NAllocatedElts==0); nlassert(_NAllocatedElts==0);
}
while(_Blocks.begin()!=_Blocks.end()) while(_Blocks.begin()!=_Blocks.end())
{ {

6
code/nel/include/nel/misc/types_nl.h
View file

@ -283,11 +283,11 @@ typedef uint64_t uint64;
typedef int sint; // at least 32bits (depend of processor) typedef int sint; // at least 32bits (depend of processor)
typedef unsigned int uint; // 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" # define NL_I64 "l"
#else #else
# define NL_I64 "ll" # define NL_I64 "ll"
#endif // __SIZEOF_LONG__ == 8 #endif // _LP64
#endif // NL_OS_UNIX #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 CHashSet std::tr1::unordered_set
# define CHashMultiMap std::tr1::unordered_multimap # 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 #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 CHashMap stdext::hash_map
# define CHashSet stdext::hash_set # define CHashSet stdext::hash_set
# define CHashMultiMap stdext::hash_multimap # define CHashMultiMap stdext::hash_multimap

1
code/nel/src/3d/driver/direct3d/stddirect3d.h
View file

@ -38,6 +38,7 @@
#include <exception> #include <exception>
#include <utility> #include <utility>
#include <deque> #include <deque>
#include <limits>
#ifdef NL_DEBUG #ifdef NL_DEBUG