diff options
| author | megamage <none@none> | 2009-05-31 16:15:12 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-31 16:15:12 -0500 |
| commit | f92e8315cf9af3268545dad6c440614a13d06207 (patch) | |
| tree | b1f3979f62aed7df1c4d57d0346be046c3482098 /src/shared/Common.h | |
| parent | a36d4fc7aefe9fff8def7bf9ffd6185a8291eb06 (diff) | |
[7918] Improve portability in work with uint64 string format specifiers and in code literals. Author: VladimirMangos
* Replace platform seelction MaNGOS code for select format descriptor for uint64 by using ACE define.
I64FMTD renamed to UI64FMTD for more clear name.
* Add new define UI64LIT (base at ACE seelction) for build portables uint64 literals.
Please always use UI64LIT(0x00001) instead less portable 0x00001LL
--HG--
branch : trunk
Diffstat (limited to 'src/shared/Common.h')
| -rw-r--r-- | src/shared/Common.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/shared/Common.h b/src/shared/Common.h index 37ced4c8e11..735c57eedbe 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -103,6 +103,7 @@ #include "LockedQueue.h" #include "Threading.h" +#include <ace/Basic_Types.h> #include <ace/Guard_T.h> #include <ace/RW_Thread_Mutex.h> #include <ace/Thread_Mutex.h> @@ -130,8 +131,6 @@ #include <float.h> #define I64FMT "%016I64X" -#define I64FMTD "%I64u" -#define SI64FMTD "%I64d" #define snprintf _snprintf #define atoll __atoi64 #define vsnprintf _vsnprintf @@ -143,10 +142,15 @@ #define stricmp strcasecmp #define strnicmp strncasecmp #define I64FMT "%016llX" -#define I64FMTD "%llu" -#define SI64FMTD "%lld" + #endif +#define UI64FMTD ACE_UINT64_FORMAT_SPECIFIER +#define UI64LIT(N) ACE_UINT64_LITERAL(N) + +#define SI64FMTD ACE_INT64_FORMAT_SPECIFIER +#define SI64LIT(N) ACE_INT64_LITERAL(N) + inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; } #define atol(a) strtoul( a, NULL, 10) |