From 68e22ad311ed19d3ad4460f2d178a46eda19ed65 Mon Sep 17 00:00:00 2001 From: leak Date: Sun, 1 Jun 2014 20:55:31 +0200 Subject: Replaced ACE based typedefs for fixed width ints with C++11 versions --- src/server/shared/Define.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'src/server/shared/Define.h') diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index e43853e5bb0..0678d84decd 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -19,23 +19,26 @@ #ifndef TRINITY_DEFINE_H #define TRINITY_DEFINE_H -#include "CompilerDefs.h" - -#include -#include +#if COMPILER_GNU == COMPILER_GNU +# if !defined(__STDC_FORMAT_MACROS) +# define __STDC_FORMAT_MACROS +# endif +#endif #include +#include +#include "CompilerDefs.h" #define TRINITY_LITTLEENDIAN 0 #define TRINITY_BIGENDIAN 1 #if !defined(TRINITY_ENDIAN) -# if defined (ACE_BIG_ENDIAN) +# if defined (BOOST_ENDIAN_BIG_BYTE) # define TRINITY_ENDIAN TRINITY_BIGENDIAN -# else //ACE_BYTE_ORDER != ACE_BIG_ENDIAN +# else # define TRINITY_ENDIAN TRINITY_LITTLEENDIAN -# endif //ACE_BYTE_ORDER -#endif //TRINITY_ENDIAN +# endif +#endif #if PLATFORM == PLATFORM_WINDOWS # define TRINITY_PATH_MAX MAX_PATH @@ -70,21 +73,19 @@ # define ATTR_DEPRECATED #endif //COMPILER == COMPILER_GNU -#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) +#define UI64FMTD PRIu64 +#define UI64LIT(N) UINT64_C(N) -#define SIZEFMTD ACE_SIZE_T_FORMAT_SPECIFIER +#define SI64FMTD PRId64 +#define SI64LIT(N) INT64_C(N) -typedef ACE_INT64 int64; -typedef ACE_INT32 int32; -typedef ACE_INT16 int16; -typedef ACE_INT8 int8; -typedef ACE_UINT64 uint64; -typedef ACE_UINT32 uint32; -typedef ACE_UINT16 uint16; -typedef ACE_UINT8 uint8; +typedef int64_t int64; +typedef int32_t int32; +typedef int16_t int16; +typedef int8_t int8; +typedef uint64_t uint64; +typedef uint32_t uint32; +typedef uint16_t uint16; +typedef uint8_t uint8; #endif //TRINITY_DEFINE_H -- cgit v1.2.3 From daa5c0ad0de795f289e8328680f658de01e732dd Mon Sep 17 00:00:00 2001 From: leak Date: Sun, 8 Jun 2014 23:25:40 +0200 Subject: Use correct define for endianess --- src/server/shared/Define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/shared/Define.h') diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 0678d84decd..2258456e1a1 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -33,7 +33,7 @@ #define TRINITY_BIGENDIAN 1 #if !defined(TRINITY_ENDIAN) -# if defined (BOOST_ENDIAN_BIG_BYTE) +# if defined (BOOST_BIG_ENDIAN) # define TRINITY_ENDIAN TRINITY_BIGENDIAN # else # define TRINITY_ENDIAN TRINITY_LITTLEENDIAN -- cgit v1.2.3 From d15ced546f52323fe6b4000f1ac0673da31de2cd Mon Sep 17 00:00:00 2001 From: Subv Date: Tue, 8 Jul 2014 17:33:34 -0500 Subject: Fixed the UI64FMT and SI64FMT format specifiers --- src/server/shared/Define.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/shared/Define.h') diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 2258456e1a1..9140dc9701e 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -73,10 +73,10 @@ # define ATTR_DEPRECATED #endif //COMPILER == COMPILER_GNU -#define UI64FMTD PRIu64 +#define UI64FMTD "%" PRIu64 #define UI64LIT(N) UINT64_C(N) -#define SI64FMTD PRId64 +#define SI64FMTD "%" PRId64 #define SI64LIT(N) INT64_C(N) typedef int64_t int64; -- cgit v1.2.3 From a70fb4c3064c225ea88bd63a0d10b280fdfb47b1 Mon Sep 17 00:00:00 2001 From: leak Date: Mon, 14 Jul 2014 20:54:55 +0200 Subject: Corrected order of inclusion in Define.h --- src/server/shared/Define.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/shared/Define.h') diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 9140dc9701e..e173925f314 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -19,7 +19,9 @@ #ifndef TRINITY_DEFINE_H #define TRINITY_DEFINE_H -#if COMPILER_GNU == COMPILER_GNU +#include "CompilerDefs.h" + +#if COMPILER == COMPILER_GNU # if !defined(__STDC_FORMAT_MACROS) # define __STDC_FORMAT_MACROS # endif @@ -27,7 +29,6 @@ #include #include -#include "CompilerDefs.h" #define TRINITY_LITTLEENDIAN 0 #define TRINITY_BIGENDIAN 1 -- cgit v1.2.3