File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -112,7 +112,11 @@ else()
112112endif ()
113113
114114set (CMAKE_CXX_STANDARD_REQUIRED ON )
115+
116+ # allow extension on windows cause mingw cant build without
117+ if (NOT WIN32 )
115118set (CMAKE_CXX_EXTENSIONS OFF )
119+ endif ()
116120
117121if (NOT USE_STD_MALLOC)
118122 unset (TBB_INCLUDE_DIRS CACHE )
Original file line number Diff line number Diff 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 ()
Original file line number Diff line number Diff line change 2525#include " Common.h"
2626#include " Policies/Singleton.h"
2727#include < string>
28+ #include < memory>
2829#include " ace/Thread_Mutex.h"
2930
3031enum AccountOpResult
Original file line number Diff line number Diff 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
254257typedef std::unordered_set<ObjectGuid> ObjectGuidSet;
255258typedef std::list<ObjectGuid> GuidList;
Original file line number Diff line number Diff line change 3131#include " Util.h"
3232#include " World.h"
3333#include " GridMap.h"
34+ #include " Map.h"
3435
3536pAuraProcHandler AuraProcHandler[TOTAL_AURAS ] =
3637{
You can’t perform that action at this time.
0 commit comments