From a7498d2f560e24b2ae3b4f6cc46ea2223a41e16f Mon Sep 17 00:00:00 2001 From: click Date: Sat, 21 Aug 2010 02:27:12 +0200 Subject: [PATCH] Core/Includes: Include ACE as an external dependency, not local (#include "ace/something.h" -> #include ) --HG-- branch : trunk --- src/server/game/Achievements/AchievementMgr.h | 2 +- src/server/game/Addons/AddonMgr.h | 2 +- src/server/game/AuctionHouse/AuctionHouseMgr.h | 2 +- src/server/game/Battlegrounds/BattlegroundMgr.h | 2 +- src/server/game/Chat/Channels/ChannelMgr.h | 2 +- src/server/game/DungeonFinding/LFGMgr.h | 2 +- src/server/game/Entities/Player/SocialMgr.h | 2 +- src/server/game/Events/GameEventMgr.h | 2 +- src/server/game/Globals/ObjectMgr.h | 2 +- src/server/game/Instances/InstanceSaveMgr.h | 4 ++-- src/server/game/Maps/Map.h | 4 ++-- src/server/game/Maps/MapManager.h | 4 ++-- src/server/game/Movement/MovementGenerator.h | 2 +- src/server/game/OutdoorPvP/OutdoorPvPMgr.h | 2 +- src/server/game/Pools/PoolMgr.h | 2 +- src/server/game/Server/Protocol/Handlers/AddonHandler.h | 2 +- src/server/game/Server/Protocol/WorldLog.h | 2 +- src/server/game/World/World.h | 2 +- src/server/shared/Dynamic/ObjectRegistry.h | 2 +- src/server/shared/Threading/Threading.h | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 4c8b897667..f0da91c2fa 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -22,7 +22,7 @@ #include #include "Common.h" -#include "ace/Singleton.h" +#include #include "DatabaseEnv.h" #include "DBCEnums.h" #include "DBCStores.h" diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h index a2233db259..6f0a44e998 100644 --- a/src/server/game/Addons/AddonMgr.h +++ b/src/server/game/Addons/AddonMgr.h @@ -21,7 +21,7 @@ #define _ADDONMGR_H #include "Common.h" -#include "ace/Singleton.h" +#include #include diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index 03a00f46da..d81d68cb36 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -19,7 +19,7 @@ #ifndef _AUCTION_HOUSE_MGR_H #define _AUCTION_HOUSE_MGR_H -#include "ace/Singleton.h" +#include #include "SharedDefines.h" diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index a68ae71ed7..c0cd4fb3e4 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -25,7 +25,7 @@ #include "DBCEnums.h" #include "Battleground.h" #include "BattlegroundQueue.h" -#include "ace/Singleton.h" +#include typedef std::map BattlegroundSet; diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h index c4e872de6b..070864b8e1 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.h +++ b/src/server/game/Chat/Channels/ChannelMgr.h @@ -22,7 +22,7 @@ #include "Common.h" #include "Channel.h" -#include "ace/Singleton.h" +#include #include #include diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 2820d1c7ed..3c71877df8 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -20,7 +20,7 @@ #define _LFGMGR_H #include "Common.h" -#include "ace/Singleton.h" +#include #include "Group.h" #include "LFG.h" diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 1f40fcf28e..30789ca0e0 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -21,7 +21,7 @@ #ifndef __TRINITY_SOCIALMGR_H #define __TRINITY_SOCIALMGR_H -#include "ace/Singleton.h" +#include #include "DatabaseEnv.h" #include "Common.h" diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 3d35e74a69..4af59251cb 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -24,7 +24,7 @@ #include "Common.h" #include "SharedDefines.h" #include "Define.h" -#include "ace/Singleton.h" +#include #define max_ge_check_delay DAY // 1 day in seconds diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 52f78b0761..4394280625 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -37,7 +37,7 @@ #include "Map.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" -#include "ace/Singleton.h" +#include #include "SQLStorage.h" #include "Vehicle.h" #include "ObjectMgr.h" diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 3d3d7ab5a2..9e375a5067 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -23,8 +23,8 @@ #define __InstanceSaveMgr_H #include "Define.h" -#include "ace/Singleton.h" -#include "ace/Thread_Mutex.h" +#include +#include #include #include #include "UnorderedMap.h" diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 509120d04a..568a6ea57a 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -22,8 +22,8 @@ #define TRINITY_MAP_H #include "Define.h" -#include "ace/RW_Thread_Mutex.h" -#include "ace/Thread_Mutex.h" +#include +#include #include "DBCStructure.h" #include "GridDefines.h" diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index 21a913ce75..86d2471013 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -22,8 +22,8 @@ #define TRINITY_MAPMANAGER_H #include "Define.h" -#include "ace/Singleton.h" -#include "ace/Thread_Mutex.h" +#include +#include #include "Common.h" #include "Map.h" #include "GridStates.h" diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index 9699f6951c..cf21eacae0 100644 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -22,7 +22,7 @@ #define TRINITY_MOVEMENTGENERATOR_H #include "Define.h" -#include "ace/Singleton.h" +#include #include "ObjectRegistry.h" #include "FactoryHolder.h" #include "Common.h" diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h index f140cbe421..6952a4a22b 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h @@ -22,7 +22,7 @@ #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000 #include "OutdoorPvP.h" -#include "ace/Singleton.h" +#include class Player; class GameObject; diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index c2852cb38e..6632c7e74a 100644 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -20,7 +20,7 @@ #define TRINITY_POOLHANDLER_H #include "Define.h" -#include "ace/Singleton.h" +#include #include "Creature.h" #include "GameObject.h" diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h index f875e265ab..d6497f5e08 100644 --- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h +++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h @@ -23,7 +23,7 @@ #include "Common.h" #include "Config.h" -#include "ace/Singleton.h" +#include #include "WorldPacket.h" class AddonHandler diff --git a/src/server/game/Server/Protocol/WorldLog.h b/src/server/game/Server/Protocol/WorldLog.h index fd228ce455..33ad8e62f1 100644 --- a/src/server/game/Server/Protocol/WorldLog.h +++ b/src/server/game/Server/Protocol/WorldLog.h @@ -26,7 +26,7 @@ #define TRINITY_WORLDLOG_H #include "Common.h" -#include "ace/Singleton.h" +#include #include "Errors.h" #include diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 27afbf9ab3..da5e27f947 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -29,7 +29,7 @@ #include "Timer.h" #include #include "SharedDefines.h" -#include "ace/Atomic_Op.h" +#include #include "QueryResult.h" #include "Callback.h" diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index 0d24cc1982..85d08e1210 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -23,7 +23,7 @@ #include "Define.h" #include "Dynamic/UnorderedMap.h" -#include "ace/Singleton.h" +#include #include #include diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h index fa046117c6..36e3613440 100644 --- a/src/server/shared/Threading/Threading.h +++ b/src/server/shared/Threading/Threading.h @@ -21,7 +21,7 @@ #include #include -#include "ace/Atomic_Op.h" +#include #include namespace ACE_Based