Show
Ignore:
Timestamp:
11/19/08 13:27:40 (17 years ago)
Author:
yumileroy
Message:

[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.

Original author: Seline
Date: 2008-10-14 11:57:03-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/framework/Policies/ThreadingModel.h

    r2 r44  
    11/*  
    2  * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> 
     2 * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     3 * 
     4 * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> 
    35 * 
    46 * This program is free software; you can redistribute it and/or modify 
     
    911 * This program is distributed in the hope that it will be useful, 
    1012 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
    1214 * GNU General Public License for more details. 
    1315 * 
    1416 * You should have received a copy of the GNU General Public License 
    1517 * along with this program; if not, write to the Free Software 
    16  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    1719 */ 
    1820 
    19 #ifndef MANGOS_THREADINGMODEL_H 
    20 #define MANGOS_THREADINGMODEL_H 
     21#ifndef TRINITY_THREADINGMODEL_H 
     22#define TRINITY_THREADINGMODEL_H 
    2123 
    2224/** 
     
    2729#include "Platform/Define.h" 
    2830 
    29 namespace MaNGOS 
     31namespace Trinity 
    3032{ 
    3133    inline void Guard(void *) {} 
    3234 
    33     template<typename MUTEX> class MANGOS_DLL_DECL GeneralLock 
     35    template<typename MUTEX> class TRINITY_DLL_DECL GeneralLock 
    3436    { 
    3537        public: 
     
    5052 
    5153    template <class T> 
    52         class MANGOS_DLL_DECL SingleThreaded 
     54        class TRINITY_DLL_DECL SingleThreaded 
    5355    { 
    5456        public: 
     
    6870    // object level lockable 
    6971    template<class T, class MUTEX> 
    70         class MANGOS_DLL_DECL ObjectLevelLockable 
     72        class TRINITY_DLL_DECL ObjectLevelLockable 
    7173    { 
    7274        public: 
     
    9799 
    98100    template<class T, class MUTEX> 
    99         class MANGOS_DLL_DECL ClassLevelLockable 
     101        class TRINITY_DLL_DECL ClassLevelLockable 
    100102    { 
    101103        public: 
     
    121123} 
    122124 
    123 template<class T, class MUTEX> MUTEX MaNGOS::ClassLevelLockable<T, MUTEX>::si_mtx; 
     125template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_mtx; 
    124126 
    125127#define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \ 
    126     template class MANGOS_DLL_DECL MaNGOS::ClassLevelLockable<CTYPE, MUTEX > 
     128    template class TRINITY_DLL_DECL Trinity::ClassLevelLockable<CTYPE, MUTEX > 
    127129#endif