mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/Player.cpp
	src/game/Spell.cpp
This commit is contained in:
tomrus88 2008-11-08 16:52:28 +03:00
commit 7974d1cb94
67 changed files with 939 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shared/Database/Database.h
View file

@ -21,15 +21,15 @@
#include "zthread/Thread.h"
#include "../src/zthread/ThreadImpl.h"
#include "Utilities/HashMap.h"
#include "Utilities/UnorderedMap.h"
#include "Database/SqlDelayThread.h"
class SqlTransaction;
class SqlResultQueue;
class SqlQueryHolder;
typedef HM_NAMESPACE::hash_map<ZThread::ThreadImpl*, SqlTransaction*> TransactionQueues;
typedef HM_NAMESPACE::hash_map<ZThread::ThreadImpl*, SqlResultQueue*> QueryQueues;
typedef UNORDERED_MAP<ZThread::ThreadImpl*, SqlTransaction*> TransactionQueues;
typedef UNORDERED_MAP<ZThread::ThreadImpl*, SqlResultQueue*> QueryQueues;
#define MAX_QUERY_LEN 32*1024