diff options
| author | Spp <spp@jorge.gr> | 2013-05-21 11:27:12 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-05-21 11:27:12 +0200 |
| commit | ec0688ade37677d43e22c05b7c480217b0528709 (patch) | |
| tree | e802c8a0fd2da0c7006b39c94c136821ff35ab6b /src/server/shared/Logging/Log.h | |
| parent | 86afccc8ff7f54d8ebf28473bc2799dc7e039083 (diff) | |
| parent | 00c11688974fc00342a62387b6e2d682884e0721 (diff) | |
Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)
Conflicts:
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Groups/Group.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Miscellaneous/Language.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
Diffstat (limited to 'src/server/shared/Logging/Log.h')
| -rw-r--r-- | src/server/shared/Logging/Log.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h index d7612c76738..e35e4f3ab7f 100644 --- a/src/server/shared/Logging/Log.h +++ b/src/server/shared/Logging/Log.h @@ -96,14 +96,14 @@ inline bool Log::ShouldLog(LogFilterType type, LogLevel level) const #define sLog ACE_Singleton<Log, ACE_Thread_Mutex>::instance() -#if PLATFORM != PLATFORM_WINDOWS -# define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \ +#if COMPILER != COMPILER_MICROSOFT +#define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \ do { \ if (sLog->ShouldLog(filterType__, level__)) \ sLog->call__(filterType__, __VA_ARGS__); \ } while (0) #else -# define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \ +#define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \ __pragma(warning(push)) \ __pragma(warning(disable:4127)) \ do { \ |