aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2014-07-20 16:06:35 +0200
committerShauren <shauren.trinity@gmail.com>2014-07-20 16:06:35 +0200
commitc0eba6a127a950e05af7ad116c95288a4fa66a17 (patch)
tree0c99c927818dccd41cd798837d8a10268ca82ce9 /src/server/shared
parent27c561cb9e03c9fea20232fa4a00ee97b5cd081e (diff)
Fixed gcc build without pch
Diffstat (limited to 'src/server/shared')
-rw-r--r--src/server/shared/Debugging/Errors.cpp1
-rw-r--r--src/server/shared/Define.h11
-rw-r--r--src/server/shared/Utilities/Util.h12
3 files changed, 8 insertions, 16 deletions
diff --git a/src/server/shared/Debugging/Errors.cpp b/src/server/shared/Debugging/Errors.cpp
index 62e97d56d42..0621cfa5b6d 100644
--- a/src/server/shared/Debugging/Errors.cpp
+++ b/src/server/shared/Debugging/Errors.cpp
@@ -18,6 +18,7 @@
#include "Errors.h"
+#include <cstdio>
#include <cstdlib>
#include <thread>
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index c04a2a81629..570964b8671 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -21,16 +21,19 @@
#include "CompilerDefs.h"
-#include <cstddef>
-#include <cinttypes>
-#include <climits>
-
#if COMPILER == COMPILER_GNU
# if !defined(__STDC_FORMAT_MACROS)
# define __STDC_FORMAT_MACROS
# endif
+# if !defined(__STDC_CONSTANT_MACROS)
+# define __STDC_CONSTANT_MACROS
+# endif
#endif
+#include <cstddef>
+#include <cinttypes>
+#include <climits>
+
#define TRINITY_LITTLEENDIAN 0
#define TRINITY_BIGENDIAN 1
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index c384a6eeaed..c95e0e3cfa3 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -351,11 +351,6 @@ bool IsIPAddress(char const* ipaddress);
uint32 CreatePIDFile(const std::string& filename);
std::string ByteArrayToHexStr(uint8 const* bytes, uint32 length, bool reverse = false);
-#endif
-
-//handler for operations on large flags
-#ifndef _FLAG96
-#define _FLAG96
// simple class for not-modifyable list
template <typename T>
@@ -402,13 +397,6 @@ public:
part[2] = p3;
}
- flag96(uint64 p1, uint32 p2)
- {
- part[0] = (uint32)(p1 & UI64LIT(0x00000000FFFFFFFF));
- part[1] = (uint32)((p1 >> 32) & UI64LIT(0x00000000FFFFFFFF));
- part[2] = p2;
- }
-
inline bool IsEqual(uint32 p1 = 0, uint32 p2 = 0, uint32 p3 = 0) const
{
return (part[0] == p1 && part[1] == p2 && part[2] == p3);