Changeset 44 for trunk/src/shared/Log.h

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/shared/Log.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 MANGOSSERVER_LOG_H 
    20 #define MANGOSSERVER_LOG_H 
     21#ifndef TRINITYCORE_LOG_H 
     22#define TRINITYCORE_LOG_H 
    2123 
    2224#include "Common.h" 
    … …  
    5456const int Color_count = int(WHITE)+1; 
    5557 
    56 class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ZThread::FastMutex> > 
     58class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ZThread::FastMutex> > 
    5759{ 
    58     friend class MaNGOS::OperatorNew<Log>; 
     60    friend class Trinity::OperatorNew<Log>; 
    5961    Log() : raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL), dberLogfile(NULL), m_colored(false) { Initialize(); } 
    6062    ~Log() 
    … …  
    138140}; 
    139141 
    140 #define sLog MaNGOS::Singleton<Log>::Instance() 
     142#define sLog Trinity::Singleton<Log>::Instance() 
    141143 
    142 #ifdef MANGOS_DEBUG 
    143 #define DEBUG_LOG MaNGOS::Singleton<Log>::Instance().outDebug 
     144#ifdef TRINITY_DEBUG 
     145#define DEBUG_LOG Trinity::Singleton<Log>::Instance().outDebug 
    144146#else 
    145147#define DEBUG_LOG 
    … …  
    147149 
    148150// primary for script library 
    149 void MANGOS_DLL_SPEC outstring_log(const char * str, ...) ATTR_PRINTF(1,2); 
    150 void MANGOS_DLL_SPEC detail_log(const char * str, ...) ATTR_PRINTF(1,2); 
    151 void MANGOS_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2); 
    152 void MANGOS_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2); 
    153 void MANGOS_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2); 
     151void TRINITY_DLL_SPEC outstring_log(const char * str, ...) ATTR_PRINTF(1,2); 
     152void TRINITY_DLL_SPEC detail_log(const char * str, ...) ATTR_PRINTF(1,2); 
     153void TRINITY_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2); 
     154void TRINITY_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2); 
     155void TRINITY_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2); 
    154156#endif