diff options
author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-02 14:12:48 +0100 |
---|---|---|
committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-02 14:12:48 +0100 |
commit | b873156c3c1654553319158275f29ac2f818f3ce (patch) | |
tree | 204be4b38ee32328a980fe65b46e41336c5a38e8 /src/server/shared/Database/Transaction.h | |
parent | 05efdaf39349f057eabf58252532dff76511e7ef (diff) | |
parent | ebd14b4f01cc64a2a488bdbb1046897cc4da8e9a (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.h
Diffstat (limited to 'src/server/shared/Database/Transaction.h')
-rw-r--r-- | src/server/shared/Database/Transaction.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h index 9b7f9afc30b..026cc1fdf96 100644 --- a/src/server/shared/Database/Transaction.h +++ b/src/server/shared/Database/Transaction.h @@ -29,6 +29,9 @@ class Transaction friend class TransactionTask; friend class MySQLConnection; + template <typename T> + friend class DatabaseWorkerPool; + public: Transaction() : _cleanedUp(false) {} ~Transaction() { Cleanup(); } @@ -65,4 +68,4 @@ class TransactionTask : public SQLOperation SQLTransaction m_trans; }; -#endif
\ No newline at end of file +#endif |