Nuked some compiler errors on Linux
This commit is contained in:
1 parent
d15ced546f
commit
6eaffdac51
4 files changed
+6
-5
No files matched your search
@@ -25,6 +25,7 @@
|
||||
#include <condition_variable>
|
||||
#include "ProducerConsumerQueue.h"
|
||||
|
||||
class MapUpdateRequest;
|
||||
class Map;
|
||||
|
||||
class MapUpdater
|
||||
@@ -48,7 +49,7 @@ class MapUpdater
|
||||
|
||||
private:
|
||||
|
||||
ProducerConsumerQueue <MapUpdateRequest*> _queue;
|
||||
ProducerConsumerQueue<MapUpdateRequest*> _queue;
|
||||
|
||||
std::vector<std::thread> _workerThreads;
|
||||
std::atomic<bool> _cancelationToken;
|
||||
|
||||
@@ -1002,8 +1002,8 @@ class WorldSession
|
||||
bool m_playerSave;
|
||||
LocaleConstant m_sessionDbcLocale;
|
||||
LocaleConstant m_sessionDbLocaleIndex;
|
||||
std::atomic_uint32_t m_latency;
|
||||
std::atomic_uint32_t m_clientTimeDelay;
|
||||
std::atomic<uint32> m_latency;
|
||||
std::atomic<uint32> m_clientTimeDelay;
|
||||
AccountData m_accountData[NUM_ACCOUNT_DATA_TYPES];
|
||||
uint32 m_Tutorials[MAX_ACCOUNT_TUTORIAL_VALUES];
|
||||
bool m_TutorialsChanged;
|
||||
|
||||
@@ -524,7 +524,7 @@ class World
|
||||
return instance;
|
||||
}
|
||||
|
||||
static std::atomic_uint32_t m_worldLoopCounter;
|
||||
static std::atomic<uint32> m_worldLoopCounter;
|
||||
|
||||
WorldSession* FindSession(uint32 id) const;
|
||||
void AddSession(WorldSession* s);
|
||||
|
||||
@@ -33,7 +33,7 @@ static void lockingCallback(int mode, int type, const char* /*file*/, int /*line
|
||||
|
||||
static void threadIdCallback(CRYPTO_THREADID * id)
|
||||
{
|
||||
CRYPTO_THREADID_set_numeric(id, std::this_thread::get_id().hash());
|
||||
CRYPTO_THREADID_set_numeric(id, std::hash<std::thread::id>()(std::this_thread::get_id()));
|
||||
}
|
||||
|
||||
void OpenSSLCrypto::threadsSetup()
|
||||
|
||||
Reference in new issue
Block a user