Changeset 44 for trunk/src/framework

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

Location:
trunk/src/framework
Files:
33 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/framework/Dynamic/FactoryHolder.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_FACTORY_HOLDER 
    20 #define MANGOS_FACTORY_HOLDER 
     21#ifndef TRINITY_FACTORY_HOLDER 
     22#define TRINITY_FACTORY_HOLDER 
    2123 
    2224#include "Platform/Define.h" 
    … …  
    2830 */ 
    2931template<class T, class Key = std::string> 
    30 class MANGOS_DLL_DECL FactoryHolder 
     32class TRINITY_DLL_DECL FactoryHolder 
    3133{ 
    3234    public: 
    3335        typedef ObjectRegistry<FactoryHolder<T, Key >, Key > FactoryHolderRegistry; 
    34         typedef MaNGOS::Singleton<FactoryHolderRegistry > FactoryHolderRepository; 
     36        typedef Trinity::Singleton<FactoryHolderRegistry > FactoryHolderRepository; 
    3537 
    3638        FactoryHolder(Key k) : i_key(k) {} 

  • trunk/src/framework/Dynamic/ObjectRegistry.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_OBJECTREGISTRY_H 
    20 #define MANGOS_OBJECTREGISTRY_H 
     21#ifndef TRINITY_OBJECTREGISTRY_H 
     22#define TRINITY_OBJECTREGISTRY_H 
    2123 
    2224#include "Platform/Define.h" 
    … …  
    3032 */ 
    3133template<class T, class Key = std::string> 
    32 class MANGOS_DLL_DECL ObjectRegistry 
     34class TRINITY_DLL_DECL ObjectRegistry 
    3335{ 
    3436    public: 
    … …  
    9496    private: 
    9597        RegistryMapType i_registeredObjects; 
    96         friend class MaNGOS::OperatorNew<ObjectRegistry<T, Key> >; 
     98        friend class Trinity::OperatorNew<ObjectRegistry<T, Key> >; 
    9799 
    98100        // protected for friend use since it should be a singleton 

  • trunk/src/framework/GameSystem/Grid.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_GRID_H 
    20 #define MANGOS_GRID_H 
     21#ifndef TRINITY_GRID_H 
     22#define TRINITY_GRID_H 
    2123 
    2224/* 
    2325  @class Grid 
    24   Grid is a logical segment of the game world represented inside MaNGOS. 
     26  Grid is a logical segment of the game world represented inside TrinIty. 
    2527  Grid is bind at compile time to a particular type of object which 
    2628  we call it the object of interested.  There are many types of loader, 
    … …  
    4446class WORLD_OBJECT_TYPES, 
    4547class GRID_OBJECT_TYPES, 
    46 class ThreadModel = MaNGOS::SingleThreaded<ACTIVE_OBJECT> 
     48class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT> 
    4749> 
    48 class MANGOS_DLL_DECL Grid 
     50class TRINITY_DLL_DECL Grid 
    4951{ 
    5052    // allows the GridLoader to access its internals 

  • trunk/src/framework/GameSystem/GridLoader.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_GRIDLOADER_H 
    20 #define MANGOS_GRIDLOADER_H 
     21#ifndef TRINITY_GRIDLOADER_H 
     22#define TRINITY_GRIDLOADER_H 
    2123 
    2224/** 
    … …  
    4143class GRID_OBJECT_TYPES 
    4244> 
    43 class MANGOS_DLL_DECL GridLoader 
     45class TRINITY_DLL_DECL GridLoader 
    4446{ 
    4547    public: 

  • trunk/src/framework/GameSystem/GridRefManager.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 

  • trunk/src/framework/GameSystem/GridReference.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 
    … …  
    2628 
    2729template<class OBJECT> 
    28 class MANGOS_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>, OBJECT> 
     30class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>, OBJECT> 
    2931{ 
    3032    protected: 

  • trunk/src/framework/GameSystem/NGrid.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_NGRID_H 
    20 #define MANGOS_NGRID_H 
     21#ifndef TRINITY_NGRID_H 
     22#define TRINITY_NGRID_H 
    2123 
    2224/** NGrid is nothing more than a wrapper of the Grid with an NxN cells 
    … …  
    5961class WORLD_OBJECT_TYPES, 
    6062class GRID_OBJECT_TYPES, 
    61 class ThreadModel = MaNGOS::SingleThreaded<ACTIVE_OBJECT> 
     63class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT> 
    6264> 
    63 class MANGOS_DLL_DECL NGrid 
     65class TRINITY_DLL_DECL NGrid 
    6466{ 
    6567    public: 

  • trunk/src/framework/GameSystem/TypeContainer.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_TYPECONTAINER_H 
    20 #define MANGOS_TYPECONTAINER_H 
     21#ifndef TRINITY_TYPECONTAINER_H 
     22#define TRINITY_TYPECONTAINER_H 
    2123 
    2224/* 
    … …  
    9698 
    9799template<class OBJECT_TYPES> 
    98 class MANGOS_DLL_DECL TypeMapContainer 
     100class TRINITY_DLL_DECL TypeMapContainer 
    99101{ 
    100102    public: 
    101         template<class SPECIFIC_TYPE> size_t Count() const { return MaNGOS::Count(i_elements, (SPECIFIC_TYPE*)NULL); } 
     103        template<class SPECIFIC_TYPE> size_t Count() const { return Trinity::Count(i_elements, (SPECIFIC_TYPE*)NULL); } 
    102104 
    103         template<class SPECIFIC_TYPE> SPECIFIC_TYPE* find(OBJECT_HANDLE hdl, SPECIFIC_TYPE *fake) { return MaNGOS::Find(i_elements, hdl,fake); } 
     105        template<class SPECIFIC_TYPE> SPECIFIC_TYPE* find(OBJECT_HANDLE hdl, SPECIFIC_TYPE *fake) { return Trinity::Find(i_elements, hdl,fake); } 
    104106 
    105107        /// find a specific type of object in the container 
    106         template<class SPECIFIC_TYPE> const SPECIFIC_TYPE* find(OBJECT_HANDLE hdl, SPECIFIC_TYPE *fake) const { return MaNGOS::Find(i_elements, hdl,fake); } 
     108        template<class SPECIFIC_TYPE> const SPECIFIC_TYPE* find(OBJECT_HANDLE hdl, SPECIFIC_TYPE *fake) const { return Trinity::Find(i_elements, hdl,fake); } 
    107109 
    108110        /// inserts a specific object into the container 
    109111        template<class SPECIFIC_TYPE> bool insert(OBJECT_HANDLE hdl, SPECIFIC_TYPE *obj) 
    110112        { 
    111             SPECIFIC_TYPE* t = MaNGOS::Insert(i_elements, obj, hdl); 
     113            SPECIFIC_TYPE* t = Trinity::Insert(i_elements, obj, hdl); 
    112114            return (t != NULL); 
    113115        } 
    … …  
    116118        template<class SPECIFIC_TYPE> bool remove(SPECIFIC_TYPE* obj, OBJECT_HANDLE hdl) 
    117119        { 
    118             SPECIFIC_TYPE* t = MaNGOS::Remove(i_elements, obj, hdl); 
     120            SPECIFIC_TYPE* t = Trinity::Remove(i_elements, obj, hdl); 
    119121            return (t != NULL); 
    120122        } 

  • trunk/src/framework/GameSystem/TypeContainerFunctions.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 
    … …  
    3032#include <map> 
    3133 
    32 namespace MaNGOS 
     34namespace Trinity 
    3335{ 
    3436    /* ContainerMapList Helpers */ 

  • trunk/src/framework/GameSystem/TypeContainerFunctionsPtr.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 
    … …  
    3032#include <map> 
    3133 
    32 namespace MaNGOS 
     34namespace Trinity 
    3335{ 
    3436    /* ContainerMapList Helpers */ 

  • trunk/src/framework/GameSystem/TypeContainerVisitor.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_TYPECONTAINERVISITOR_H 
    20 #define MANGOS_TYPECONTAINERVISITOR_H 
     21#ifndef TRINITY_TYPECONTAINERVISITOR_H 
     22#define TRINITY_TYPECONTAINERVISITOR_H 
    2123 
    2224/* 
    … …  
    9698 
    9799template<class VISITOR, class TYPE_CONTAINER> 
    98 class MANGOS_DLL_DECL TypeContainerVisitor 
     100class TRINITY_DLL_DECL TypeContainerVisitor 
    99101{ 
    100102    public: 

  • trunk/src/framework/Makefile.am

    r23 r44  
    55# This program is free software; you can redistribute it and/or modify 
    66# it under the terms of the GNU General Public License as published by 
    7 # the Free Software Foundation; either version 3 of the License, or 
     7# the Free Software Foundation; either version 2 of the License, or 
    88# (at your option) any later version. 
    99# 
    … …  
    6565        Utilities/TypeList.h 
    6666 
     67 

  • trunk/src/framework/Network/SocketDefines.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_SOCKETDEFINES_H 
    20 #define MANGOS_SOCKETDEFINES_H 
     21#ifndef TRINITY_SOCKETDEFINES_H 
     22#define TRINITY_SOCKETDEFINES_H 
    2123 
    2224#ifdef WIN32 

  • trunk/src/framework/Platform/CompilerDefs.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_COMPILERDEFS_H 
    20 #define MANGOS_COMPILERDEFS_H 
     21#ifndef TRINITY_COMPILERDEFS_H 
     22#define TRINITY_COMPILERDEFS_H 
    2123 
    2224#define PLATFORM_WINDOWS 0 

  • trunk/src/framework/Platform/Define.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_DEFINE_H 
    20 #define MANGOS_DEFINE_H 
     21#ifndef TRINITY_DEFINE_H 
     22#define TRINITY_DEFINE_H 
    2123 
    2224#include "Platform/CompilerDefs.h" 
    … …  
    8890*/ 
    8991 
    90 #define MANGOS_LITTLEENDIAN 0 
    91 #define MANGOS_BIGENDIAN    1 
    92  
    93 #if !defined(MANGOS_ENDIAN) 
     92#define TRINITY_LITTLEENDIAN 0 
     93#define TRINITY_BIGENDIAN    1 
     94 
     95#if !defined(TRINITY_ENDIAN) 
    9496#  if defined(LITTLE_ENDIAN) || defined(BIG_ENDIAN) 
    9597#    if defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN) 
    9698#      if defined(BYTE_ORDER) 
    9799#        if   (BYTE_ORDER == LITTLE_ENDIAN) 
    98 #          define MANGOS_ENDIAN MANGOS_LITTLEENDIAN 
     100#          define TRINITY_ENDIAN TRINITY_LITTLEENDIAN 
    99101#        elif (BYTE_ORDER == BIG_ENDIAN) 
    100 #          define MANGOS_ENDIAN MANGOS_BIGENDIAN 
     102#          define TRINITY_ENDIAN TRINITY_BIGENDIAN 
    101103#        endif 
    102104#      endif 
    103105#    elif defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)  
    104 #      define MANGOS_ENDIAN MANGOS_LITTLEENDIAN 
     106#      define TRINITY_ENDIAN TRINITY_LITTLEENDIAN 
    105107#    elif !defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN) 
    106 #      define MANGOS_ENDIAN MANGOS_BIGENDIAN 
     108#      define TRINITY_ENDIAN TRINITY_BIGENDIAN 
    107109#    endif 
    108110#  elif defined(_LITTLE_ENDIAN) || defined(_BIG_ENDIAN) 
    … …  
    110112#      if defined(_BYTE_ORDER) 
    111113#        if   (_BYTE_ORDER == _LITTLE_ENDIAN) 
    112 #          define MANGOS_ENDIAN MANGOS_LITTLEENDIAN 
     114#          define TRINITY_ENDIAN TRINITY_LITTLEENDIAN 
    113115#        elif (_BYTE_ORDER == _BIG_ENDIAN) 
    114 #          define MANGOS_ENDIAN MANGOS_BIGENDIAN 
     116#          define TRINITY_ENDIAN TRINITY_BIGENDIAN 
    115117#        endif 
    116118#      endif 
    117119#    elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)  
    118 #      define MANGOS_ENDIAN MANGOS_LITTLE_ENDIAN 
     120#      define TRINITY_ENDIAN TRINITY_LITTLE_ENDIAN 
    119121#    elif !defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) 
    120 #      define MANGOS_ENDIAN MANGOS_BIGENDIAN 
     122#      define TRINITY_ENDIAN TRINITY_BIGENDIAN 
    121123#    endif 
    122124#  elif 0     /* **** EDIT HERE IF NECESSARY **** */ 
    123 #    define MANGOS_ENDIAN MANGOS_LITTLEENDIAN 
     125#    define TRINITY_ENDIAN TRINITY_LITTLEENDIAN 
    124126#  elif 0     /* **** EDIT HERE IF NECESSARY **** */ 
    125 #    define MANGOS_ENDIAN MANGOS_BIGENDIAN 
     127#    define TRINITY_ENDIAN TRINITY_BIGENDIAN 
    126128#  elif (('1234' >> 24) == '1') 
    127 #    define MANGOS_ENDIAN MANGOS_LITTLEENDIAN 
     129#    define TRINITY_ENDIAN TRINITY_LITTLEENDIAN 
    128130#  elif (('4321' >> 24) == '1') 
    129 #    define MANGOS_ENDIAN MANGOS_BIGENDIAN 
    130 #  else 
    131 #    define MANGOS_ENDIAN MANGOS_LITTLEENDIAN 
     131#    define TRINITY_ENDIAN TRINITY_BIGENDIAN 
     132#  else 
     133#    define TRINITY_ENDIAN TRINITY_LITTLEENDIAN 
    132134#  endif 
    133135#endif 
    … …  
    136138 
    137139#if PLATFORM == PLATFORM_WINDOWS 
    138 #define MANGOS_EXPORT __declspec(dllexport) 
    139 #define MANGOS_LIBRARY_HANDLE HMODULE 
    140 #define MANGOS_LOAD_LIBRARY(a) LoadLibrary(a) 
    141 #define MANGOS_CLOSE_LIBRARY FreeLibrary 
    142 #define MANGOS_GET_PROC_ADDR GetProcAddress 
    143 #define MANGOS_IMPORT __cdecl 
    144 #define MANGOS_SCRIPT_EXT ".dll" 
    145 #define MANGOS_SCRIPT_NAME "TrinityScript" 
    146 #else 
    147 #define MANGOS_LIBRARY_HANDLE void* 
    148 #define MANGOS_EXPORT export 
    149 #define MANGOS_LOAD_LIBRARY(a) dlopen(a,RTLD_NOW) 
    150 #define MANGOS_CLOSE_LIBRARY dlclose 
    151 #define MANGOS_GET_PROC_ADDR dlsym 
     140#define TRINITY_EXPORT __declspec(dllexport) 
     141#define TRINITY_LIBRARY_HANDLE HMODULE 
     142#define TRINITY_LOAD_LIBRARY(a) LoadLibrary(a) 
     143#define TRINITY_CLOSE_LIBRARY FreeLibrary 
     144#define TRINITY_GET_PROC_ADDR GetProcAddress 
     145#define TRINITY_IMPORT __cdecl 
     146#define TRINITY_SCRIPT_EXT ".dll" 
     147#define TRINITY_SCRIPT_NAME "TrinityScript" 
     148#else 
     149#define TRINITY_LIBRARY_HANDLE void* 
     150#define TRINITY_EXPORT export 
     151#define TRINITY_LOAD_LIBRARY(a) dlopen(a,RTLD_NOW) 
     152#define TRINITY_CLOSE_LIBRARY dlclose 
     153#define TRINITY_GET_PROC_ADDR dlsym 
    152154 
    153155#if defined(__APPLE_CC__) && defined(BIG_ENDIAN) 
    154 #define MANGOS_IMPORT __attribute__ ((longcall)) 
    155 #else 
    156 #define MANGOS_IMPORT __attribute__ ((cdecl)) 
    157 #endif 
    158  
    159 #define MANGOS_SCRIPT_EXT ".so" 
    160 #define MANGOS_SCRIPT_NAME "libtrinityscript" 
     156#define TRINITY_IMPORT __attribute__ ((longcall)) 
     157#else 
     158#define TRINITY_IMPORT __attribute__ ((cdecl)) 
     159#endif 
     160 
     161#define TRINITY_SCRIPT_EXT ".so" 
     162#define TRINITY_SCRIPT_NAME "libtrinityscript" 
    161163#endif 
    162164 
    163165#ifdef WIN32 
    164 #ifdef MANGOS_WIN32_DLL_IMPORT 
    165  
    166 #define MANGOS_DLL_DECL __declspec(dllimport) 
    167 #else 
    168 #ifdef MANGOS_WIND_DLL_EXPORT 
    169 #define MANGOS_DLL_DECL __declspec(dllexport) 
    170 #else 
    171 #define MANGOS_DLL_DECL 
    172 #endif 
    173 #endif 
    174  
    175 #else 
    176 #define MANGOS_DLL_DECL 
     166#ifdef TRINITY_WIN32_DLL_IMPORT 
     167 
     168#define TRINITY_DLL_DECL __declspec(dllimport) 
     169#else 
     170#ifdef TRINITY_WIND_DLL_EXPORT 
     171#define TRINITY_DLL_DECL __declspec(dllexport) 
     172#else 
     173#define TRINITY_DLL_DECL 
     174#endif 
     175#endif 
     176 
     177#else 
     178#define TRINITY_DLL_DECL 
    177179#endif 
    178180 
    179181#ifndef DEBUG 
    180 #define MANGOS_INLINE inline 
    181 #else 
    182 #ifndef MANGOS_DEBUG 
    183 #define MANGOS_DEBUG 
    184 #endif 
    185 #define MANGOS_INLINE 
     182#define TRINITY_INLINE inline 
     183#else 
     184#ifndef TRINITY_DEBUG 
     185#define TRINITY_DEBUG 
     186#endif 
     187#define TRINITY_INLINE 
    186188#endif 
    187189 
    … …  
    210212 
    211213#if PLATFORM == PLATFORM_WINDOWS 
    212 #  define MANGOS_DLL_SPEC __declspec(dllexport) 
     214#  define TRINITY_DLL_SPEC __declspec(dllexport) 
    213215#  ifndef DECLSPEC_NORETURN 
    214216#    define DECLSPEC_NORETURN __declspec(noreturn) 
    215217#  endif 
    216218#else 
    217 #  define MANGOS_DLL_SPEC 
     219#  define TRINITY_DLL_SPEC 
    218220#  define DECLSPEC_NORETURN 
    219221#endif 

  • trunk/src/framework/Policies/CreationPolicy.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_CREATIONPOLICY_H 
    20 #define MANGOS_CREATIONPOLICY_H 
     21#ifndef TRINITY_CREATIONPOLICY_H 
     22#define TRINITY_CREATIONPOLICY_H 
    2123 
    2224#include <stdlib.h> 
    2325#include "Platform/Define.h" 
    2426 
    25 namespace MaNGOS 
     27namespace Trinity 
    2628{ 
    2729    /** 
    … …  
    2931     */ 
    3032    template <class T> 
    31         class MANGOS_DLL_DECL OperatorNew 
     33        class TRINITY_DLL_DECL OperatorNew 
    3234    { 
    3335        public: 
    … …  
    4143     */ 
    4244    template <class T> 
    43         class MANGOS_DLL_DECL LocalStaticCreation 
     45        class TRINITY_DLL_DECL LocalStaticCreation 
    4446    { 
    4547        union MaxAlign 
    … …  
    7072     */ 
    7173    template<class T> 
    72         class MANGOS_DLL_DECL CreateUsingMalloc 
     74        class TRINITY_DLL_DECL CreateUsingMalloc 
    7375    { 
    7476        public: 
    … …  
    9193     */ 
    9294    template<class T, class CALL_BACK> 
    93         class MANGOS_DLL_DECL CreateOnCallBack 
     95        class TRINITY_DLL_DECL CreateOnCallBack 
    9496    { 
    9597        public: 

  • trunk/src/framework/Policies/ObjectLifeTime.cpp

    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 
    … …  
    2022#include "ObjectLifeTime.h" 
    2123 
    22 namespace MaNGOS 
     24namespace Trinity 
    2325{ 
    2426    extern "C" void external_wrapper(void *p) 
    … …  
    2729    } 
    2830 
    29     void MANGOS_DLL_SPEC at_exit( void (*func)() ) 
     31    void TRINITY_DLL_SPEC at_exit( void (*func)() ) 
    3032    { 
    3133        external_wrapper((void*)func); 

  • trunk/src/framework/Policies/ObjectLifeTime.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_OBJECTLIFETIME_H 
    20 #define MANGOS_OBJECTLIFETIME_H 
     21#ifndef TRINITY_OBJECTLIFETIME_H 
     22#define TRINITY_OBJECTLIFETIME_H 
    2123 
    2224#include <stdexcept> 
    … …  
    2527typedef void (* Destroyer)(void); 
    2628 
    27 namespace MaNGOS 
     29namespace Trinity 
    2830{ 
    29     void MANGOS_DLL_SPEC at_exit( void (*func)() ); 
     31    void TRINITY_DLL_SPEC at_exit( void (*func)() ); 
    3032 
    3133    template <class T> 
    32         class MANGOS_DLL_DECL ObjectLifeTime 
     34        class TRINITY_DLL_DECL ObjectLifeTime 
    3335    { 
    3436        public: 

  • trunk/src/framework/Policies/Singleton.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_SINGLETON_H 
    20 #define MANGOS_SINGLETON_H 
     21#ifndef TRINITY_SINGLETON_H 
     22#define TRINITY_SINGLETON_H 
    2123 
    2224/** 
    … …  
    2830#include "ObjectLifeTime.h" 
    2931 
    30 namespace MaNGOS 
     32namespace Trinity 
    3133{ 
    3234    template 
    3335        < 
    3436        typename T, 
    35         class ThreadingModel = MaNGOS::SingleThreaded<T>, 
    36         class CreatePolicy = MaNGOS::OperatorNew<T>, 
    37         class LifeTimePolicy = MaNGOS::ObjectLifeTime<T> 
     37        class ThreadingModel = Trinity::SingleThreaded<T>, 
     38        class CreatePolicy = Trinity::OperatorNew<T>, 
     39        class LifeTimePolicy = Trinity::ObjectLifeTime<T> 
    3840        > 
    39         class MANGOS_DLL_DECL Singleton 
     41        class TRINITY_DLL_DECL Singleton 
    4042    { 
    4143        public: 

  • trunk/src/framework/Policies/SingletonImp.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_SINGLETONIMPL_H 
    20 #define MANGOS_SINGLETONIMPL_H 
     21#ifndef TRINITY_SINGLETONIMPL_H 
     22#define TRINITY_SINGLETONIMPL_H 
    2123 
    2224#include "Singleton.h" 
    … …  
    3335> 
    3436T& 
    35 MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy >::Instance() 
     37Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy >::Instance() 
    3638{ 
    3739    if( !si_instance ) 
    … …  
    6264> 
    6365void 
    64 MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySingleton() 
     66Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySingleton() 
    6567{ 
    6668    CreatePolicy::Destroy(si_instance); 
    … …  
    7072 
    7173#define INSTANTIATE_SINGLETON_1(TYPE) \ 
    72     template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >; \ 
    73     template<> TYPE* MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_instance = 0; \ 
    74     template<> bool MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_destroyed = false 
     74    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \ 
     75    template<> TYPE* Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \ 
     76    template<> bool Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false 
    7577 
    7678#define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \ 
    77     template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >; \ 
    78     template<> TYPE* MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_instance = 0; \ 
    79     template<> bool MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_destroyed = false 
     79    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \ 
     80    template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \ 
     81    template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false 
    8082 
    8183#define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \ 
    82     template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >; \ 
    83     template<> TYPE* MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >::si_instance = 0; \ 
    84     template<> bool MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeType<TYPE> >::si_destroyed = false 
     84    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >; \ 
     85    template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \ 
     86    template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeType<TYPE> >::si_destroyed = false 
    8587 
    8688#define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \ 
    87     template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \ 
    88     template<> TYPE* MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \ 
    89     template<> bool MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false 
     89    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \ 
     90    template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \ 
     91    template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false 
    9092#endif 

  • 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 

  • trunk/src/framework/Utilities/ByteConverter.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_BYTECONVERTER_H 
    20 #define MANGOS_BYTECONVERTER_H 
     21#ifndef TRINITY_BYTECONVERTER_H 
     22#define TRINITY_BYTECONVERTER_H 
    2123 
    2224/** ByteConverter reverse your byte order.  This is use 
    … …  
    4547} 
    4648 
    47 #if MANGOS_ENDIAN == MANGOS_BIGENDIAN 
     49#if TRINITY_ENDIAN == TRINITY_BIGENDIAN 
    4850template<typename T> inline void EndianConvert(T& val) { ByteConverter::apply<T>(&val); } 
    4951#else 

  • trunk/src/framework/Utilities/Callback.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_CALLBACK_H 
    20 #define MANGOS_CALLBACK_H 
     21#ifndef TRINITY_CALLBACK_H 
     22#define TRINITY_CALLBACK_H 
    2123 
    2224/// ------------ BASE CLASSES ------------ 
    2325 
    24 namespace MaNGOS 
     26namespace Trinity 
    2527{ 
    2628    template < class Class, typename ParamType1 = void, typename ParamType2 = void, typename ParamType3 = void, typename ParamType4 = void > 
    … …  
    194196/// --------- GENERIC CALLBACKS ---------- 
    195197 
    196 namespace MaNGOS 
     198namespace Trinity 
    197199{ 
    198200    class ICallback 
    … …  
    270272class QueryResult; 
    271273 
    272 namespace MaNGOS 
     274namespace Trinity 
    273275{ 
    274276    class IQueryCallback 

  • trunk/src/framework/Utilities/CountedReference/Reference.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_REFERENCE_H 
    20 #define  MANGOS_REFERENCE_H 
     21#ifndef  TRINITY_REFERENCE_H 
     22#define  TRINITY_REFERENCE_H 
    2123 
    2224/** 
    … …  
    3941< 
    4042typename T, 
    41 class THREADING_MODEL = MaNGOS::SingleThreaded<T> 
     43class THREADING_MODEL = Trinity::SingleThreaded<T> 
    4244> 
    43 class MANGOS_DLL_DECL Referencer 
     45class TRINITY_DLL_DECL Referencer 
    4446{ 
    4547    typedef typename THREADING_MODEL::Lock Lock; 

  • trunk/src/framework/Utilities/CountedReference/ReferenceHolder.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_REFERENCEHOLDER_H 
    20 #define MANGOS_REFERENCEHOLDER_H 
     21#ifndef TRINITY_REFERENCEHOLDER_H 
     22#define TRINITY_REFERENCEHOLDER_H 
    2123 
    2224/** ReferenceHolder holds the actualy referenced obejct as well the refence 

  • trunk/src/framework/Utilities/CountedReference/ReferenceImpl.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_REFERENCEIMPL_H 
    20 #define MANGOS_REFERENCEIMPL_H 
     21#ifndef TRINITY_REFERENCEIMPL_H 
     22#define TRINITY_REFERENCEIMPL_H 
    2123 
    2224#include "Reference.h" 

  • trunk/src/framework/Utilities/EventProcessor.cpp

    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 

  • trunk/src/framework/Utilities/EventProcessor.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 

  • trunk/src/framework/Utilities/HashMap.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_HASHMAP_H 
    20 #define MANGOS_HASHMAP_H 
     21#ifndef TRINITY_HASHMAP_H 
     22#define TRINITY_HASHMAP_H 
    2123 
    2224#include "Platform/CompilerDefs.h" 

  • trunk/src/framework/Utilities/LinkedList.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 

  • trunk/src/framework/Utilities/LinkedReference/RefManager.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 

  • trunk/src/framework/Utilities/LinkedReference/Reference.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 

  • trunk/src/framework/Utilities/TypeList.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_TYPELIST_H 
    20 #define MANGOS_TYPELIST_H 
     21#ifndef TRINITY_TYPELIST_H 
     22#define TRINITY_TYPELIST_H 
    2123 
    2224/*