diff options
| author | Spp <spp@jorge.gr> | 2013-01-02 09:07:52 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-02 09:07:52 +0100 |
| commit | 2292025bf9ccd78c004027f2e0621473ced82b22 (patch) | |
| tree | 077a93d879c3e8740c72df1830c9ad7fca36bf88 /src/server/shared/Utilities/Util.h | |
| parent | c85dc26584decad8e4b8d1cb5a05bdb899a56e63 (diff) | |
Core/Misc: Replaced some macro definitions with inline functions
Diffstat (limited to 'src/server/shared/Utilities/Util.h')
| -rw-r--r-- | src/server/shared/Utilities/Util.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index 3cf8857ead6..10c2e866a7d 100644 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -352,11 +352,6 @@ std::string ByteArrayToHexStr(uint8 const* bytes, uint32 length, bool reverse = #ifndef _FLAG96 #define _FLAG96 -#ifndef PAIR64_HIPART -#define PAIR64_HIPART(x) (uint32)((uint64(x) >> 32) & UI64LIT(0x00000000FFFFFFFF)) -#define PAIR64_LOPART(x) (uint32)(uint64(x) & UI64LIT(0x00000000FFFFFFFF)) -#endif - // simple class for not-modifyable list template <typename T> class HookList @@ -404,8 +399,8 @@ public: flag96(uint64 p1, uint32 p2) { - part[0] = PAIR64_LOPART(p1); - part[1] = PAIR64_HIPART(p1); + part[0] = (uint32)(p1 & UI64LIT(0x00000000FFFFFFFF)); + part[1] = (uint32)((p1 >> 32) & UI64LIT(0x00000000FFFFFFFF)); part[2] = p2; } |