mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 13:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9107] Fix most of the gcc warnings

Browse source 
* use UI64FMTD instead of "%u" for uint64 output
* on most *NIX systems, I64FMT is "%016lX" and not "%016llX"
* also fix typo: renamed GridMap::loadHeihgtData to GridMap::loadHeightData

Note: there are still many warnings from the 3rd party libraries g3dlite and ACE. Those warnings won't be fixed with that commit.
Also, a few warnings from MaNGOS are left, they'll be fixed later.

Signed-off-by: XTZGZoReX <xtzgzorex@gmail.com>
This commit is contained in:
DasBlub 2010-01-02 22:43:50 +01:00 • committed by XTZGZoReX
parent e568293d2c
commit ebb063beb9
14 changed files with 53 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/shared/Common.h
View file

@ -55,16 +55,16 @@
#include "Platform/Define.h"
#if COMPILER == COMPILER_MICROSOFT
# pragma warning(disable:4996) // 'function': was declared deprecated
# pragma warning(disable:4996) // 'function': was declared deprecated
#ifndef __SHOW_STUPID_WARNINGS__
# pragma warning(disable:4005) // 'identifier' : macro redefinition
# pragma warning(disable:4018) // 'expression' : signed/unsigned mismatch
# pragma warning(disable:4244) // 'argument' : conversion from 'type1' to 'type2', possible loss of data
# pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
# pragma warning(disable:4305) // 'identifier' : truncation from 'type1' to 'type2'
# pragma warning(disable:4311) // 'variable' : pointer truncation from 'type' to 'type'
# pragma warning(disable:4355) // 'this' : used in base member initializer list
# pragma warning(disable:4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning)
# pragma warning(disable:4005) // 'identifier' : macro redefinition
# pragma warning(disable:4018) // 'expression' : signed/unsigned mismatch
# pragma warning(disable:4244) // 'argument' : conversion from 'type1' to 'type2', possible loss of data
# pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
# pragma warning(disable:4305) // 'identifier' : truncation from 'type1' to 'type2'
# pragma warning(disable:4311) // 'variable' : pointer truncation from 'type' to 'type'
# pragma warning(disable:4355) // 'this' : used in base member initializer list
# pragma warning(disable:4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning)
#endif // __SHOW_STUPID_WARNINGS__
#endif // __GNUC__
@ -116,20 +116,25 @@
#if COMPILER == COMPILER_MICROSOFT
#include <float.h>
# include <float.h>
#define I32FMT "%08I32X"
#define I64FMT "%016I64X"
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#define finite(X) _finite(X)
# define I32FMT "%08I32X"
# define I64FMT "%016I64X"
# define snprintf _snprintf
# define vsnprintf _vsnprintf
# define finite(X) _finite(X)
#else
#define stricmp strcasecmp
#define strnicmp strncasecmp
#define I32FMT "%08X"
#define I64FMT "%016llX"
# define stricmp strcasecmp
# define strnicmp strncasecmp
# define I32FMT "%08X"
# if ACE_SIZEOF_LONG == 8
# define I64FMT "%016lX"
# else
# define I64FMT "%016llX"
# endif /* ACE_SIZEOF_LONG == 8 */
#endif
@ -194,15 +199,15 @@ inline char * mangos_strdup(const char * source)
// we always use stdlibc++ std::max/std::min, undefine some not C++ standard defines (Win API and some pother platforms)
#ifdef max
#undef max
# undef max
#endif
#ifdef min
#undef min
# undef min
#endif
#ifndef M_PI
#define M_PI 3.14159265358979323846
# define M_PI 3.14159265358979323846
#endif
#endif