Changeset 206

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

[svn] * Switch from hashmap to unordered map. - cleanup source - mangos. Help - Aokromes

Original author: KingPin?
Date: 2008-11-10 06:53:00-06:00

Location:
trunk
Files:
29 modified
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/bindings/scripts/ScriptMgr.cpp

    r187 r206  
    4646 
    4747// Text Maps 
    48 HM_NAMESPACE::hash_map<int32, StringTextData> TextMap; 
     48UNORDERED_MAP<int32, StringTextData> TextMap; 
    4949 
    5050 
    … …  
    5656 
    5757//Event AI summon structure. Used exclusivly by mob_event_ai.cpp. 
    58 HM_NAMESPACE::hash_map<uint32, EventAI_Summon> EventAI_Summon_Map; 
     58UNORDERED_MAP<uint32, EventAI_Summon> EventAI_Summon_Map; 
    5959 
    6060//Event AI error prevention structure. Used at runtime to prevent error log spam of same creature id. 
    61 //HM_NAMESPACE::hash_map<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList; 
     61//UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList; 
    6262 
    6363uint32 EAI_ErrorLevel; 
    … …  
    17931793    } 
    17941794 
    1795     HM_NAMESPACE::hash_map<int32, StringTextData>::iterator i = TextMap.find(textEntry); 
     1795    UNORDERED_MAP<int32, StringTextData>::iterator i = TextMap.find(textEntry); 
    17961796 
    17971797    if (i == TextMap.end()) 

  • trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp

    r202 r206  
    865865                Creature* pCreature = NULL; 
    866866 
    867                 HM_NAMESPACE::hash_map<uint32, EventAI_Summon>::iterator i = EventAI_Summon_Map.find(param3); 
     867                UNORDERED_MAP<uint32, EventAI_Summon>::iterator i = EventAI_Summon_Map.find(param3); 
    868868 
    869869                if (i == EventAI_Summon_Map.end()) 

  • trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h

    r109 r206  
    196196 
    197197//EventSummon_Map 
    198 extern HM_NAMESPACE::hash_map<uint32, EventAI_Summon> EventAI_Summon_Map; 
     198extern UNORDERED_MAP<uint32, EventAI_Summon> EventAI_Summon_Map; 
    199199 
    200200//EventAI Error handling 
    … …  
    209209 
    210210//Error prevention list 
    211 extern HM_NAMESPACE::hash_map<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList; 
     211extern UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList; 
    212212 
    213213//Defines 

  • trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp

    r90 r206  
    476476 
    477477    //Stomach map, bool = true then in stomach 
    478     HM_NAMESPACE::hash_map<uint64, bool> Stomach_Map; 
     478    UNORDERED_MAP<uint64, bool> Stomach_Map; 
    479479 
    480480    void Reset() 
    … …  
    535535            return NULL; 
    536536 
    537         HM_NAMESPACE::hash_map<uint64, bool>::iterator i = Stomach_Map.begin(); 
     537        UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin(); 
    538538 
    539539        std::list<Unit*> temp; 
    … …  
    682682                    DoCast(m_creature, SPELL_RED_COLORATION, true); 
    683683 
    684                     HM_NAMESPACE::hash_map<uint64, bool>::iterator i = Stomach_Map.begin(); 
     684                    UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin(); 
    685685 
    686686                    //Kick all players out of stomach 
    … …  
    714714                { 
    715715                    //Apply aura to all players in stomach 
    716                     HM_NAMESPACE::hash_map<uint64, bool>::iterator i = Stomach_Map.begin(); 
     716                    UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin(); 
    717717 
    718718                    while (i != Stomach_Map.end()) 

  • trunk/src/framework/Dynamic/ObjectRegistry.h

    r102 r206  
    2323 
    2424#include "Platform/Define.h" 
    25 #include "Utilities/HashMap.h" 
     25#include "Utilities/UnorderedMap.h" 
    2626#include "Policies/Singleton.h" 
    2727 

  • trunk/src/framework/Makefile.am

    r192 r206  
    6161    Utilities/Callback.h \ 
    6262    Utilities/EventProcessor.h \ 
    63     Utilities/HashMap.h \ 
     63    Utilities/UnorderedMap.h \ 
    6464    Utilities/LinkedList.h \ 
    6565    Utilities/TypeList.h 

  • trunk/src/framework/Utilities/UnorderedMap.h

    r102 r206  
    1919 */ 
    2020 
    21 #ifndef TRINITY_HASHMAP_H 
    22 #define TRINITY_HASHMAP_H 
     21#ifndef TRINITY_UNORDERED_MAP_H 
     22#define TRINITY_UNORDERED_MAP_H 
    2323 
    2424#include "Platform/CompilerDefs.h" 
    … …  
    2727#if COMPILER == COMPILER_INTEL 
    2828#include <ext/hash_map> 
     29#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4 
     30#include <tr1/unordered_map> 
    2931#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 
    3032#include <ext/hash_map> 
     33#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1    // VC9.0 and later 
     34#include <unordered_map> 
    3135#else 
    3236#include <hash_map> 
    … …  
    3438 
    3539#ifdef _STLPORT_VERSION 
    36 #define HM_NAMESPACE std 
     40#define UNORDERED_MAP std::hash_map 
    3741using std::hash_map; 
     42#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 
     43#define UNORDERED_MAP std::tr1::unordered_map 
    3844#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 
    39 #define HM_NAMESPACE stdext 
     45#define UNORDERED_MAP stdext::hash_map 
    4046using stdext::hash_map; 
    4147#elif COMPILER == COMPILER_INTEL 
    42 #define HM_NAMESPACE std 
     48#define UNORDERED_MAP std::hash_map 
    4349using std::hash_map; 
     50#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4 
     51#define UNORDERED_MAP std::tr1::unordered_map 
    4452#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 
    45 #define HM_NAMESPACE __gnu_cxx 
    46 using __gnu_cxx::hash_map; 
     53#define UNORDERED_MAP std::__gnu_cxx::hash_map 
    4754 
    4855namespace __gnu_cxx 
    … …  
    6067 
    6168#else 
    62 #define HM_NAMESPACE std 
     69#define UNORDERED_MAP std::hash_map 
    6370using std::hash_map; 
    6471#endif 

  • trunk/src/game/Group.h

    r132 r206  
    143143        typedef MemberSlotList::const_iterator member_citerator; 
    144144 
    145         typedef HM_NAMESPACE::hash_map< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap; 
     145        typedef UNORDERED_MAP< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap; 
    146146    protected: 
    147147        typedef MemberSlotList::iterator member_witerator; 

  • trunk/src/game/HateMatrix.h

    r102 r206  
    2222#define TRINITY_HATEMATRIX_H 
    2323 
    24 #include "Utilities/HashMap.h" 
     24#include "Utilities/UnorderedMap.h" 
    2525#include <cassert> 
    2626 

  • trunk/src/game/InstanceSaveMgr.h

    r102 r206  
    2828#include <list> 
    2929#include <map> 
    30 #include "Utilities/HashMap.h" 
     30#include "Utilities/UnorderedMap.h" 
    3131#include "Database/DatabaseEnv.h" 
    3232 
    … …  
    122122 
    123123        typedef std::map<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveMap; 
    124         typedef HM_NAMESPACE::hash_map<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveHashMap; 
     124        typedef UNORDERED_MAP<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveHashMap; 
    125125        typedef std::map<uint32 /*mapId*/, InstanceSaveMap> InstanceSaveMapMap; 
    126126 

  • trunk/src/game/ItemEnchantmentMgr.cpp

    r102 r206  
    4343 
    4444typedef std::vector<EnchStoreItem> EnchStoreList; 
    45 typedef HM_NAMESPACE::hash_map<uint32, EnchStoreList> EnchantmentStore; 
     45typedef UNORDERED_MAP<uint32, EnchStoreList> EnchantmentStore; 
    4646 
    4747static EnchantmentStore RandomItemEnch; 

  • trunk/src/game/LootMgr.h

    r102 r206  
    123123typedef std::map<uint32, QuestItemList *> QuestItemMap; 
    124124typedef std::vector<LootStoreItem> LootStoreItemList; 
    125 typedef HM_NAMESPACE::hash_map<uint32, LootTemplate*> LootTemplateMap; 
     125typedef UNORDERED_MAP<uint32, LootTemplate*> LootTemplateMap; 
    126126 
    127127typedef std::set<uint32> LootIdSet; 

  • trunk/src/game/Map.h

    r174 r206  
    119119#endif 
    120120 
    121 typedef HM_NAMESPACE::hash_map<Creature*, CreatureMover> CreatureMoveList; 
     121typedef UNORDERED_MAP<Creature*, CreatureMover> CreatureMoveList; 
    122122 
    123123#define MAX_HEIGHT            100000.0f                     // can be use for find ground height at surface 

  • trunk/src/game/MapInstanced.h

    r102 r206  
    2929    friend class MapManager; 
    3030    public: 
    31         typedef HM_NAMESPACE::hash_map< uint32, Map* > InstancedMaps; 
     31        typedef UNORDERED_MAP< uint32, Map* > InstancedMaps; 
    3232 
    3333        MapInstanced(uint32 id, time_t, uint32 aInstanceId); 

  • trunk/src/game/MapManager.h

    r102 r206  
    3434 
    3535    friend class Trinity::OperatorNew<MapManager>; 
    36     typedef HM_NAMESPACE::hash_map<uint32, Map*> MapMapType; 
    37     typedef std::pair<HM_NAMESPACE::hash_map<uint32, Map*>::iterator, bool>  MapMapPair; 
     36    typedef UNORDERED_MAP<uint32, Map*> MapMapType; 
     37    typedef std::pair<UNORDERED_MAP<uint32, Map*>::iterator, bool>  MapMapPair; 
    3838 
    3939    public: 

  • trunk/src/game/Object.h

    r174 r206  
    9595class GameObject; 
    9696 
    97 typedef HM_NAMESPACE::hash_map<Player*, UpdateData> UpdateDataMapType; 
     97typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType; 
    9898 
    9999struct WorldLocation 

  • trunk/src/game/ObjectAccessor.cpp

    r174 r206  
    670670/// Define the static member of HashMapHolder 
    671671 
    672 template <class T> HM_NAMESPACE::hash_map< uint64, T* > HashMapHolder<T>::m_objectMap; 
     672template <class T> UNORDERED_MAP< uint64, T* > HashMapHolder<T>::m_objectMap; 
    673673template <class T> ZThread::FastMutex HashMapHolder<T>::i_lock; 
    674674 

  • trunk/src/game/ObjectAccessor.h

    r174 r206  
    2525#include "Policies/Singleton.h" 
    2626#include "zthread/FastMutex.h" 
    27 #include "Utilities/HashMap.h" 
     27#include "Utilities/UnorderedMap.h" 
    2828#include "Policies/ThreadingModel.h" 
    2929 
    … …  
    5050    public: 
    5151 
    52         typedef HM_NAMESPACE::hash_map< uint64, T* >   MapType; 
     52        typedef UNORDERED_MAP< uint64, T* >   MapType; 
    5353        typedef ZThread::FastMutex LockType; 
    5454        typedef Trinity::GeneralLock<LockType > Guard; 
    … …  
    9292 
    9393    public: 
    94         typedef HM_NAMESPACE::hash_map<uint64, Corpse* >      Player2CorpsesMapType; 
    95         typedef HM_NAMESPACE::hash_map<Player*, UpdateData>::value_type UpdateDataValueType; 
     94        typedef UNORDERED_MAP<uint64, Corpse* >      Player2CorpsesMapType; 
     95        typedef UNORDERED_MAP<Player*, UpdateData>::value_type UpdateDataValueType; 
    9696 
    9797        template<class T> static T* GetObjectInWorld(uint64 guid, T* /*fake*/) 

  • trunk/src/game/ObjectMgr.h

    r168 r206  
    7575}; 
    7676 
    77 typedef HM_NAMESPACE::hash_map<uint32, GameTele > GameTeleMap; 
     77typedef UNORDERED_MAP<uint32, GameTele > GameTeleMap; 
    7878typedef std::list<GossipOption> CacheNpcOptionList; 
    7979 
    … …  
    124124    CellCorpseSet corpses; 
    125125}; 
    126 typedef HM_NAMESPACE::hash_map<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap; 
    127 typedef HM_NAMESPACE::hash_map<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids; 
    128  
    129 typedef HM_NAMESPACE::hash_map<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; 
     126typedef UNORDERED_MAP<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap; 
     127typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids; 
     128 
     129typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; 
    130130 
    131131struct TrinityStringLocale 
    … …  
    134134}; 
    135135 
    136 typedef HM_NAMESPACE::hash_map<uint32,CreatureData> CreatureDataMap; 
    137 typedef HM_NAMESPACE::hash_map<uint32,GameObjectData> GameObjectDataMap; 
    138 typedef HM_NAMESPACE::hash_map<uint32,CreatureLocale> CreatureLocaleMap; 
    139 typedef HM_NAMESPACE::hash_map<uint32,GameObjectLocale> GameObjectLocaleMap; 
    140 typedef HM_NAMESPACE::hash_map<uint32,ItemLocale> ItemLocaleMap; 
    141 typedef HM_NAMESPACE::hash_map<uint32,QuestLocale> QuestLocaleMap; 
    142 typedef HM_NAMESPACE::hash_map<uint32,NpcTextLocale> NpcTextLocaleMap; 
    143 typedef HM_NAMESPACE::hash_map<uint32,PageTextLocale> PageTextLocaleMap; 
    144 typedef HM_NAMESPACE::hash_map<uint32,TrinityStringLocale> TrinityStringLocaleMap; 
    145 typedef HM_NAMESPACE::hash_map<uint32,NpcOptionLocale> NpcOptionLocaleMap; 
     136typedef UNORDERED_MAP<uint32,CreatureData> CreatureDataMap; 
     137typedef UNORDERED_MAP<uint32,GameObjectData> GameObjectDataMap; 
     138typedef UNORDERED_MAP<uint32,CreatureLocale> CreatureLocaleMap; 
     139typedef UNORDERED_MAP<uint32,GameObjectLocale> GameObjectLocaleMap; 
     140typedef UNORDERED_MAP<uint32,ItemLocale> ItemLocaleMap; 
     141typedef UNORDERED_MAP<uint32,QuestLocale> QuestLocaleMap; 
     142typedef UNORDERED_MAP<uint32,NpcTextLocale> NpcTextLocaleMap; 
     143typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap; 
     144typedef UNORDERED_MAP<uint32,TrinityStringLocale> TrinityStringLocaleMap; 
     145typedef UNORDERED_MAP<uint32,NpcOptionLocale> NpcOptionLocaleMap; 
    146146 
    147147typedef std::multimap<uint32,uint32> QuestRelations; 
    … …  
    229229    uint32 unArenaInfoSlot2; 
    230230}CachePlayerInfo, *PCachePlayerInfo; 
    231 typedef HM_NAMESPACE::hash_map<uint32, PCachePlayerInfo> CachePlayerInfoMap; 
     231typedef UNORDERED_MAP<uint32, PCachePlayerInfo> CachePlayerInfoMap; 
    232232 
    233233struct PlayerCondition 
    … …  
    250250 
    251251// NPC gossip text id 
    252 typedef HM_NAMESPACE::hash_map<uint32, uint32> CacheNpcTextIdMap; 
    253  
    254  
    255 typedef HM_NAMESPACE::hash_map<uint32, VendorItemData> CacheVendorItemMap; 
    256 typedef HM_NAMESPACE::hash_map<uint32, TrainerSpellData> CacheTrainerSpellMap; 
     252typedef UNORDERED_MAP<uint32, uint32> CacheNpcTextIdMap; 
     253 
     254 
     255typedef UNORDERED_MAP<uint32, VendorItemData> CacheVendorItemMap; 
     256typedef UNORDERED_MAP<uint32, TrainerSpellData> CacheTrainerSpellMap; 
    257257 
    258258enum SkillRangeType 
    … …  
    292292        ~ObjectMgr(); 
    293293 
    294         typedef HM_NAMESPACE::hash_map<uint32, Item*> ItemMap; 
     294        typedef UNORDERED_MAP<uint32, Item*> ItemMap; 
    295295 
    296296        typedef std::set< Group * > GroupSet; 
    … …  
    298298        typedef std::set< ArenaTeam * > ArenaTeamSet; 
    299299 
    300         typedef HM_NAMESPACE::hash_map<uint32, Quest*> QuestMap; 
    301  
    302         typedef HM_NAMESPACE::hash_map<uint32, AreaTrigger> AreaTriggerMap; 
    303  
    304         typedef HM_NAMESPACE::hash_map<uint32, std::string> AreaTriggerScriptMap; 
    305  
    306         typedef HM_NAMESPACE::hash_map<uint32, ReputationOnKillEntry> RepOnKillMap; 
    307  
    308         typedef HM_NAMESPACE::hash_map<uint32, WeatherZoneChances> WeatherZoneMap; 
    309  
    310         typedef HM_NAMESPACE::hash_map<uint32, PetCreateSpellEntry> PetCreateSpellMap; 
     300        typedef UNORDERED_MAP<uint32, Quest*> QuestMap; 
     301 
     302        typedef UNORDERED_MAP<uint32, AreaTrigger> AreaTriggerMap; 
     303 
     304        typedef UNORDERED_MAP<uint32, std::string> AreaTriggerScriptMap; 
     305 
     306        typedef UNORDERED_MAP<uint32, ReputationOnKillEntry> RepOnKillMap; 
     307 
     308        typedef UNORDERED_MAP<uint32, WeatherZoneChances> WeatherZoneMap; 
     309 
     310        typedef UNORDERED_MAP<uint32, PetCreateSpellEntry> PetCreateSpellMap; 
    311311 
    312312        Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);} 
    … …  
    804804        QuestMap mQuestTemplates; 
    805805 
    806         typedef HM_NAMESPACE::hash_map<uint32, GossipText*> GossipTextMap; 
    807         typedef HM_NAMESPACE::hash_map<uint32, uint32> QuestAreaTriggerMap; 
    808         typedef HM_NAMESPACE::hash_map<uint32, uint32> BattleMastersMap; 
    809         typedef HM_NAMESPACE::hash_map<uint32, std::string> ItemTextMap; 
     806        typedef UNORDERED_MAP<uint32, GossipText*> GossipTextMap; 
     807        typedef UNORDERED_MAP<uint32, uint32> QuestAreaTriggerMap; 
     808        typedef UNORDERED_MAP<uint32, uint32> BattleMastersMap; 
     809        typedef UNORDERED_MAP<uint32, std::string> ItemTextMap; 
    810810        typedef std::set<uint32> TavernAreaTriggerSet; 
    811811        typedef std::set<uint32> GameObjectForQuestSet; 

  • trunk/src/game/Pet.h

    r152 r206  
    116116}; 
    117117 
    118 typedef HM_NAMESPACE::hash_map<uint16, PetSpell*> PetSpellMap; 
     118typedef UNORDERED_MAP<uint16, PetSpell*> PetSpellMap; 
    119119typedef std::map<uint32,uint32> TeachSpellMap; 
    120120typedef std::vector<uint32> AutoSpellList; 

  • trunk/src/game/Player.h

    r178 r206  
    9292}; 
    9393 
    94 typedef HM_NAMESPACE::hash_map<uint16, PlayerSpell*> PlayerSpellMap; 
     94typedef UNORDERED_MAP<uint16, PlayerSpell*> PlayerSpellMap; 
    9595typedef std::list<SpellModifier*> SpellModList; 
    9696 
    … …  
    13671367        time_t m_nextMailDelivereTime; 
    13681368 
    1369         typedef HM_NAMESPACE::hash_map<uint32, Item*> ItemMap; 
     1369        typedef UNORDERED_MAP<uint32, Item*> ItemMap; 
    13701370 
    13711371        ItemMap mMitems;                                    //template defined in objectmgr.cpp 
    … …  
    20252025        /*********************************************************/ 
    20262026 
    2027         typedef HM_NAMESPACE::hash_map< uint32 /*mapId*/, InstancePlayerBind > BoundInstancesMap; 
     2027        typedef UNORDERED_MAP< uint32 /*mapId*/, InstancePlayerBind > BoundInstancesMap; 
    20282028 
    20292029        void UpdateHomebindTime(uint32 time); 

  • trunk/src/game/SkillDiscovery.cpp

    r173 r206  
    4343 
    4444typedef std::list<SkillDiscoveryEntry> SkillDiscoveryList; 
    45 typedef HM_NAMESPACE::hash_map<int32, SkillDiscoveryList> SkillDiscoveryMap; 
     45typedef UNORDERED_MAP<int32, SkillDiscoveryList> SkillDiscoveryMap; 
    4646 
    4747static SkillDiscoveryMap SkillDiscoveryStore; 

  • trunk/src/game/SpellMgr.h

    r196 r206  
    2929#include "Database/SQLStorage.h" 
    3030 
    31 #include "Utilities/HashMap.h" 
     31#include "Utilities/UnorderedMap.h" 
    3232#include <map> 
    3333 
    … …  
    493493}; 
    494494 
    495 typedef HM_NAMESPACE::hash_map<uint32, SpellProcEventEntry> SpellProcEventMap; 
     495typedef UNORDERED_MAP<uint32, SpellProcEventEntry> SpellProcEventMap; 
    496496 
    497497#define ELIXIR_BATTLE_MASK    0x1 
    … …  
    532532}; 
    533533 
    534 typedef HM_NAMESPACE::hash_map<uint32, SpellTargetPosition> SpellTargetPositionMap; 
     534typedef UNORDERED_MAP<uint32, SpellTargetPosition> SpellTargetPositionMap; 
    535535 
    536536// Spell pet auras 
    … …  
    595595}; 
    596596 
    597 typedef HM_NAMESPACE::hash_map<uint32, SpellChainNode> SpellChainMap; 
     597typedef UNORDERED_MAP<uint32, SpellChainNode> SpellChainMap; 
    598598typedef std::multimap<uint32, uint32> SpellChainMapNext; 
    599599 

  • trunk/src/game/WaypointManager.h

    r102 r206  
    2424#include <vector> 
    2525#include <string> 
    26 #include "Utilities/HashMap.h" 
     26#include "Utilities/UnorderedMap.h" 
    2727 
    2828struct WaypointBehavior 
    … …  
    8383        void _clearPath(WaypointPath &path); 
    8484 
    85         typedef HM_NAMESPACE::hash_map<uint32, WaypointPath> WaypointPathMap; 
     85        typedef UNORDERED_MAP<uint32, WaypointPath> WaypointPathMap; 
    8686        WaypointPathMap m_pathMap; 
    8787}; 

  • trunk/src/game/World.h

    r149 r206  
    505505        uint32 mail_timer_expires; 
    506506 
    507         typedef HM_NAMESPACE::hash_map<uint32, Weather*> WeatherMap; 
     507        typedef UNORDERED_MAP<uint32, Weather*> WeatherMap; 
    508508        WeatherMap m_weathers; 
    509         typedef HM_NAMESPACE::hash_map<uint32, WorldSession*> SessionMap; 
     509        typedef UNORDERED_MAP<uint32, WorldSession*> SessionMap; 
    510510        SessionMap m_sessions; 
    511511        std::set<WorldSession*> m_kicked_sessions; 

  • trunk/src/shared/Common.h

    r112 r206  
    8484#endif                                                      // __GNUC__ 
    8585 
    86 #include "Utilities/HashMap.h" 
     86#include "Utilities/UnorderedMap.h" 
    8787#include <stdio.h> 
    8888#include <stdlib.h> 

  • trunk/src/shared/Database/Database.h

    r173 r206  
    2424#include "zthread/Thread.h" 
    2525#include "../src/zthread/ThreadImpl.h" 
    26 #include "Utilities/HashMap.h" 
     26#include "Utilities/UnorderedMap.h" 
    2727#include "Database/SqlDelayThread.h" 
    2828 
    … …  
    3131class SqlQueryHolder; 
    3232 
    33 typedef HM_NAMESPACE::hash_map<ZThread::ThreadImpl*, SqlTransaction*> TransactionQueues; 
    34 typedef HM_NAMESPACE::hash_map<ZThread::ThreadImpl*, SqlResultQueue*> QueryQueues; 
     33typedef UNORDERED_MAP<ZThread::ThreadImpl*, SqlTransaction*> TransactionQueues; 
     34typedef UNORDERED_MAP<ZThread::ThreadImpl*, SqlResultQueue*> QueryQueues; 
    3535 
    3636#define MAX_QUERY_LEN   1024 

  • trunk/win/VC71/framework.vcproj

    r86 r206  
    191191                        </File> 
    192192                        <File 
    193                                 RelativePath="..\..\src\framework\Utilities\HashMap.h"> 
     193                                RelativePath="..\..\src\framework\Utilities\UnorderedMap.h"> 
    194194                        </File> 
    195195                        <File 

  • trunk/win/VC80/framework.vcproj

    r86 r206  
    419419                        </File> 
    420420                        <File 
    421                                 RelativePath="..\..\src\framework\Utilities\HashMap.h" 
     421                                RelativePath="..\..\src\framework\Utilities\UnorderedMap.h" 
    422422                                > 
    423423                        </File> 

  • trunk/win/VC90/framework.vcproj

    r86 r206  
    426426                        </File> 
    427427                        <File 
    428                                 RelativePath="..\..\src\framework\Utilities\HashMap.h" 
     428                                RelativePath="..\..\src\framework\Utilities\UnorderedMap.h" 
    429429                                > 
    430430                        </File>