[Sync] Some project sync

This commit is contained in:
Antz 2014-10-13 15:25:39 +01:00 committed by Antz
parent b25fa433fe
commit bbf0020c1a
98 changed files with 5866 additions and 2121 deletions

View file

@ -45,6 +45,10 @@
# endif // ACE_BYTE_ORDER
#endif // MANGOS_ENDIAN
/**
* @brief
*
*/
typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
#define MANGOS_SCRIPT_NAME "mangosscript"
@ -105,23 +109,73 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
#if COMPILER == COMPILER_GNU || COMPILER == COMPILER_CLANG
# define ATTR_NORETURN __attribute__((noreturn))
# define ATTR_PRINTF(F,V) __attribute__ ((format (printf, F, V)))
#else // COMPILER != COMPILER_GNU
# define ATTR_PRINTF(F, V) __attribute__ ((format (printf, F, V)))
# define ATTR_DEPRECATED __attribute__((deprecated))
#else //COMPILER != COMPILER_GNU
# define ATTR_NORETURN
# define ATTR_PRINTF(F,V)
#endif // COMPILER == COMPILER_GNU
# define ATTR_PRINTF(F, V)
# define ATTR_DEPRECATED
#endif //COMPILER == COMPILER_GNU
#if COMPILER_HAS_CPP11_SUPPORT
# define OVERRIDE override
# define FINAL final
#else
# define OVERRIDE
# define FINAL
#endif //COMPILER_HAS_CPP11_SUPPORT
/**
* @brief A signed integer of 64 bits
*
*/
typedef ACE_INT64 int64;
/**
* @brief A signed integer of 32 bits
*
*/
typedef ACE_INT32 int32;
/**
* @brief A signed integer of 16 bits
*
*/
typedef ACE_INT16 int16;
/**
* @brief A signed integer of 8 bits
*
*/
typedef ACE_INT8 int8;
/**
* @brief An unsigned integer of 64 bits
*
*/
typedef ACE_UINT64 uint64;
/**
* @brief An unsigned integer of 32 bits
*
*/
typedef ACE_UINT32 uint32;
/**
* @brief An unsigned integer of 16 bits
*
*/
typedef ACE_UINT16 uint16;
/**
* @brief An unsigned integer of 8 bits
*
*/
typedef ACE_UINT8 uint8;
#if COMPILER != COMPILER_MICROSOFT
/**
* @brief An unsigned integer of 16 bits, only for Win
*
*/
typedef uint16 WORD;
/**
* @brief An unsigned integer of 32 bits, only for Win
*
*/
typedef uint32 DWORD;
#endif // COMPILER
@ -134,12 +188,21 @@ typedef uint32 DWORD;
# define override
# define static_assert(a, b) STATIC_ASSERT_WORKAROUND(a, b)
# endif
#elif COMPILER == COMPILER_CLANG
# ifndef __cxx_static_assert
# define override
# define static_assert(a, b) STATIC_ASSERT_WORKAROUND(a, b)
# endif
#elif COMPILER == COMPILER_MICROSOFT
# if _MSC_VER < 1600
# define static_assert(a, b) STATIC_ASSERT_WORKAROUND(a, b)
# endif
#endif
/**
* @brief
*
*/
typedef uint64 OBJECT_HANDLE;
enum FieldFormat