Skip to content

Commit 1cdf63d

Browse files
committed
Fixes for mingw32 on XP.
1 parent 06e082e commit 1cdf63d

5 files changed

Lines changed: 16 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,11 @@ else()
112112
endif()
113113

114114
set(CMAKE_CXX_STANDARD_REQUIRED ON)
115+
116+
# allow extension on windows cause mingw cant build without
117+
if(NOT WIN32)
115118
set(CMAKE_CXX_EXTENSIONS OFF)
119+
endif()
116120

117121
if(NOT USE_STD_MALLOC)
118122
unset(TBB_INCLUDE_DIRS CACHE)

dep/gsoap/stdsoap2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ extern "C" {
11511151
# endif
11521152
#endif
11531153

1154-
#ifdef WIN32
1154+
#ifdef _MSC_VER
11551155
# ifdef UNDER_CE
11561156
# define soap_errno GetLastError()
11571157
# define soap_socket_errno GetLastError()

src/game/AccountMgr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "Common.h"
2626
#include "Policies/Singleton.h"
2727
#include <string>
28+
#include <memory>
2829
#include "ace/Thread_Mutex.h"
2930

3031
enum AccountOpResult

src/game/ObjectGuid.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,14 +242,17 @@ class ObjectGuid
242242
uint64 m_guid;
243243
};
244244

245-
template <>
246-
struct std::hash<ObjectGuid>
245+
namespace std
247246
{
248-
std::size_t operator()(ObjectGuid const& k) const
247+
template <>
248+
struct hash<ObjectGuid>
249249
{
250-
return std::hash<uint64>()(k.GetRawValue());
251-
}
252-
};
250+
std::size_t operator()(ObjectGuid const& k) const
251+
{
252+
return std::hash<uint64>()(k.GetRawValue());
253+
}
254+
};
255+
}
253256

254257
typedef std::unordered_set<ObjectGuid> ObjectGuidSet;
255258
typedef std::list<ObjectGuid> GuidList;

src/game/UnitAuraProcHandler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "Util.h"
3232
#include "World.h"
3333
#include "GridMap.h"
34+
#include "Map.h"
3435

3536
pAuraProcHandler AuraProcHandler[TOTAL_AURAS] =
3637
{

0 commit comments

Comments
 (0)