[svn] * Merge Temp dev SVN with Assembla.
* Changes include: - Implementation of w12x's Outdoor PvP and Game Event Systems. - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed). - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql). - Improved Config cleanup. - And many more changes. --HG-- branch : trunk
This commit is contained in:
1 parent
222cbfd464
commit
2265aef916
463 files changed
+10750
-7723
No files matched your search
@@ -1,5 +1,7 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
|
||||
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
|
||||
*
|
||||
* Thanks to the original authors: MaNGOS <http://www.mangosproject.org/>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -8,16 +10,16 @@
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef MANGOS_THREADINGMODEL_H
|
||||
#define MANGOS_THREADINGMODEL_H
|
||||
#ifndef TRINITY_THREADINGMODEL_H
|
||||
#define TRINITY_THREADINGMODEL_H
|
||||
|
||||
/**
|
||||
* @class ThreadingModel<T>
|
||||
@@ -26,11 +28,11 @@
|
||||
|
||||
#include "Platform/Define.h"
|
||||
|
||||
namespace MaNGOS
|
||||
namespace Trinity
|
||||
{
|
||||
inline void Guard(void *) {}
|
||||
|
||||
template<typename MUTEX> class MANGOS_DLL_DECL GeneralLock
|
||||
template<typename MUTEX> class TRINITY_DLL_DECL GeneralLock
|
||||
{
|
||||
public:
|
||||
GeneralLock(MUTEX &m) : i_mutex(m)
|
||||
@@ -49,7 +51,7 @@ namespace MaNGOS
|
||||
};
|
||||
|
||||
template <class T>
|
||||
class MANGOS_DLL_DECL SingleThreaded
|
||||
class TRINITY_DLL_DECL SingleThreaded
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -67,7 +69,7 @@ namespace MaNGOS
|
||||
|
||||
// object level lockable
|
||||
template<class T, class MUTEX>
|
||||
class MANGOS_DLL_DECL ObjectLevelLockable
|
||||
class TRINITY_DLL_DECL ObjectLevelLockable
|
||||
{
|
||||
public:
|
||||
ObjectLevelLockable() : i_mtx() {}
|
||||
@@ -96,7 +98,7 @@ namespace MaNGOS
|
||||
};
|
||||
|
||||
template<class T, class MUTEX>
|
||||
class MANGOS_DLL_DECL ClassLevelLockable
|
||||
class TRINITY_DLL_DECL ClassLevelLockable
|
||||
{
|
||||
public:
|
||||
class Lock;
|
||||
@@ -120,8 +122,8 @@ namespace MaNGOS
|
||||
|
||||
}
|
||||
|
||||
template<class T, class MUTEX> MUTEX MaNGOS::ClassLevelLockable<T, MUTEX>::si_mtx;
|
||||
template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_mtx;
|
||||
|
||||
#define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \
|
||||
template class MANGOS_DLL_DECL MaNGOS::ClassLevelLockable<CTYPE, MUTEX >
|
||||
template class TRINITY_DLL_DECL Trinity::ClassLevelLockable<CTYPE, MUTEX >
|
||||
#endif
|
||||
Reference in new issue
Block a user