From 5bdfbeeaf856c53154fa9d07619b47930dfa1255 Mon Sep 17 00:00:00 2001 From: DevGeniusCode <136935333+DevGeniusCode@users.noreply.github.com> Date: Mon, 1 Jun 2026 12:14:02 +0300 Subject: [PATCH] refactor: Fix pre-C++11 nested template parsing (#2760) --- Core/GameEngine/Include/Common/FileSystem.h | 4 ++-- Core/GameEngine/Include/Common/GameAudio.h | 4 ++-- Core/GameEngine/Include/Common/STLTypedefs.h | 4 ++-- Core/GameEngine/Include/GameClient/FXList.h | 2 +- Core/GameEngine/Include/GameClient/ParticleSys.h | 4 ++-- .../GameEngine/Include/GameClient/WindowVideoManager.h | 2 +- Core/GameEngine/Source/Common/Audio/GameAudio.cpp | 4 ++-- Core/GameEngine/Source/Common/System/GameMemory.cpp | 2 +- Core/GameEngine/Source/GameClient/MapUtil.cpp | 2 +- .../Include/MilesAudioDevice/MilesAudioManager.h | 2 +- .../Include/W3DDevice/GameClient/Module/W3DModelDraw.h | 4 ++-- .../Source/MilesAudioDevice/MilesAudioManager.cpp | 2 +- Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h | 10 +++++----- Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h | 2 +- Core/Libraries/Source/WWVegas/WWLib/STLUtils.h | 8 ++++---- Core/Tools/matchbot/wlib/ustring.h | 6 +++--- Generals/Code/GameEngine/Include/Common/DamageFX.h | 2 +- .../Code/GameEngine/Include/Common/ModuleFactory.h | 2 +- Generals/Code/GameEngine/Include/Common/Player.h | 2 +- Generals/Code/GameEngine/Include/Common/Team.h | 4 ++-- Generals/Code/GameEngine/Include/Common/ThingFactory.h | 2 +- .../Code/GameEngine/Include/GameClient/GameClient.h | 2 +- Generals/Code/GameEngine/Include/GameLogic/Armor.h | 2 +- Generals/Code/GameEngine/Include/GameLogic/GameLogic.h | 6 +++--- Generals/Code/GameEngine/Include/GameLogic/Locomotor.h | 2 +- .../GameEngine/Include/GameLogic/Module/AIUpdate.h | 2 +- .../GameEngine/Include/GameLogic/Module/OpenContain.h | 2 +- .../GameEngine/Include/GameLogic/ObjectCreationList.h | 2 +- .../Code/GameEngine/Include/GameLogic/ScriptEngine.h | 2 +- Generals/Code/GameEngine/Include/GameLogic/Weapon.h | 2 +- Generals/Code/GameEngine/Source/Common/PerfTimer.cpp | 2 +- .../Code/Tools/WorldBuilder/include/GroveOptions.h | 2 +- GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h | 2 +- .../Code/GameEngine/Include/Common/ModuleFactory.h | 2 +- GeneralsMD/Code/GameEngine/Include/Common/Player.h | 2 +- GeneralsMD/Code/GameEngine/Include/Common/Team.h | 4 ++-- .../Code/GameEngine/Include/Common/ThingFactory.h | 2 +- GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h | 2 +- .../Code/GameEngine/Include/GameLogic/GameLogic.h | 4 ++-- .../Code/GameEngine/Include/GameLogic/Locomotor.h | 2 +- .../GameEngine/Include/GameLogic/Module/AIUpdate.h | 2 +- .../GameEngine/Include/GameLogic/Module/OpenContain.h | 2 +- .../GameEngine/Include/GameLogic/ObjectCreationList.h | 2 +- .../Code/GameEngine/Include/GameLogic/ScriptEngine.h | 2 +- GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h | 2 +- GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp | 2 +- GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h | 2 +- .../Code/Tools/WorldBuilder/include/GroveOptions.h | 2 +- 48 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Core/GameEngine/Include/Common/FileSystem.h b/Core/GameEngine/Include/Common/FileSystem.h index 5c1f8d04a8c..322780017a5 100644 --- a/Core/GameEngine/Include/Common/FileSystem.h +++ b/Core/GameEngine/Include/Common/FileSystem.h @@ -63,7 +63,7 @@ // Type Defines //---------------------------------------------------------------------------- -typedef std::set > FilenameList; +typedef std::set/**/> FilenameList; typedef FilenameList::iterator FilenameListIter; typedef UnsignedByte FileInstance; @@ -174,7 +174,7 @@ class FileSystem : public SubsystemInterface typedef std::hash_map< rts::string_key, FileExistData, rts::string_key_hash, - rts::string_key_equal > FileExistMap; + rts::string_key_equal/**/> FileExistMap; mutable FileExistMap m_fileExist; mutable FastCriticalSectionClass m_fileExistMutex; diff --git a/Core/GameEngine/Include/Common/GameAudio.h b/Core/GameEngine/Include/Common/GameAudio.h index 5c83fd91681..df8c0211a6f 100644 --- a/Core/GameEngine/Include/Common/GameAudio.h +++ b/Core/GameEngine/Include/Common/GameAudio.h @@ -66,7 +66,7 @@ struct AudioRequest; struct AudioSettings; struct MiscAudio; -typedef std::hash_map, rts::equal_to > AudioEventInfoHash; +typedef std::hash_map, rts::equal_to/**/> AudioEventInfoHash; typedef AudioEventInfoHash::iterator AudioEventInfoHashIt; typedef UnsignedInt AudioHandle; @@ -338,7 +338,7 @@ class AudioManager : public SubsystemInterface AudioEventInfoHash m_allAudioEventInfo; AudioHandle theAudioHandlePool; - std::list > m_adjustedVolumes; + std::list/**/> m_adjustedVolumes; Real m_musicVolume; Real m_soundVolume; diff --git a/Core/GameEngine/Include/Common/STLTypedefs.h b/Core/GameEngine/Include/Common/STLTypedefs.h index 0dc2ede1dc3..68a195c45a8 100644 --- a/Core/GameEngine/Include/Common/STLTypedefs.h +++ b/Core/GameEngine/Include/Common/STLTypedefs.h @@ -108,8 +108,8 @@ typedef std::vector::iterator VecNamedRequestsIt; typedef std::vector BoolVector; typedef std::vector::iterator BoolVectorIterator; -typedef std::map< NameKeyType, Real, std::less > ProductionChangeMap; -typedef std::map< NameKeyType, VeterancyLevel, std::less > ProductionVeterancyMap; +typedef std::map< NameKeyType, Real, std::less/**/> ProductionChangeMap; +typedef std::map< NameKeyType, VeterancyLevel, std::less/**/> ProductionVeterancyMap; // Some useful, common hash and equal_to functors for use with hash_map namespace rts diff --git a/Core/GameEngine/Include/GameClient/FXList.h b/Core/GameEngine/Include/GameClient/FXList.h index 2d08f0335ec..279ebe9e3ce 100644 --- a/Core/GameEngine/Include/GameClient/FXList.h +++ b/Core/GameEngine/Include/GameClient/FXList.h @@ -209,7 +209,7 @@ class FXListStore : public SubsystemInterface private: // use the hashing function for Ints. - typedef std::hash_map< NameKeyType, FXList, rts::hash, rts::equal_to > FXListMap; + typedef std::hash_map< NameKeyType, FXList, rts::hash, rts::equal_to/**/> FXListMap; FXListMap m_fxmap; diff --git a/Core/GameEngine/Include/GameClient/ParticleSys.h b/Core/GameEngine/Include/GameClient/ParticleSys.h index e65d8773675..d9edb7caa87 100644 --- a/Core/GameEngine/Include/GameClient/ParticleSys.h +++ b/Core/GameEngine/Include/GameClient/ParticleSys.h @@ -743,8 +743,8 @@ class ParticleSystemManager : public SubsystemInterface, typedef std::list ParticleSystemList; typedef ParticleSystemList::iterator ParticleSystemListIt; - typedef std::hash_map, rts::equal_to > ParticleSystemIDMap; - typedef std::hash_map, rts::equal_to > TemplateMap; + typedef std::hash_map, rts::equal_to/**/> ParticleSystemIDMap; + typedef std::hash_map, rts::equal_to/**/> TemplateMap; ParticleSystemManager(); virtual ~ParticleSystemManager() override; diff --git a/Core/GameEngine/Include/GameClient/WindowVideoManager.h b/Core/GameEngine/Include/GameClient/WindowVideoManager.h index cc10d915ac4..6ad24e71002 100644 --- a/Core/GameEngine/Include/GameClient/WindowVideoManager.h +++ b/Core/GameEngine/Include/GameClient/WindowVideoManager.h @@ -153,7 +153,7 @@ class WindowVideoManager : public SubsystemInterface } }; - typedef std::hash_map< ConstGameWindowPtr, WindowVideo *, hashConstGameWindowPtr, std::equal_to > WindowVideoMap; + typedef std::hash_map< ConstGameWindowPtr, WindowVideo *, hashConstGameWindowPtr, std::equal_to/**/> WindowVideoMap; WindowVideoMap m_playingVideos; ///< List of currently playin Videos //WindowVideoMap m_pausedVideos; ///< List of currently paused Videos diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index 41be35aeeed..65627218365 100644 --- a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -443,7 +443,7 @@ AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd) eventToAdd->setPlayingAudioIndex( audioEvent->getPlayingAudioIndex() ); audioEvent->generatePlayInfo(); // generate pitch shift and volume shift now as well - std::list >::iterator it; + std::list/**/>::iterator it; for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) { if (it->first == audioEvent->getEventName()) { audioEvent->setVolume(it->second); @@ -601,7 +601,7 @@ void AudioManager::setAudioEventVolumeOverride( AsciiString eventToAffect, Real adjustVolumeOfPlayingAudio(eventToAffect, newVolume); } - std::list >::iterator it; + std::list/**/>::iterator it; for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) { if (it->first == eventToAffect) { if (newVolume == -1.0f) { diff --git a/Core/GameEngine/Source/Common/System/GameMemory.cpp b/Core/GameEngine/Source/Common/System/GameMemory.cpp index 5c70904eb95..82c2fab683c 100644 --- a/Core/GameEngine/Source/Common/System/GameMemory.cpp +++ b/Core/GameEngine/Source/Common/System/GameMemory.cpp @@ -184,7 +184,7 @@ DECLARE_PERF_TIMER(MemoryPoolInitFilling) Int used, peak, waste, peakwaste; UsedNPeak() : used(0), peak(0), waste(0), peakwaste(0) { } }; - typedef std::map< const char*, UsedNPeak, std::less > UsedNPeakMap; + typedef std::map< const char*, UsedNPeak, std::less/**/> UsedNPeakMap; static UsedNPeakMap TheUsedNPeakMap; static Int doingIntenseDMA = 0; #endif diff --git a/Core/GameEngine/Source/GameClient/MapUtil.cpp b/Core/GameEngine/Source/GameClient/MapUtil.cpp index 88f3675f53b..1806c50741a 100644 --- a/Core/GameEngine/Source/GameClient/MapUtil.cpp +++ b/Core/GameEngine/Source/GameClient/MapUtil.cpp @@ -722,7 +722,7 @@ Bool WouldMapTransfer( const AsciiString& mapName ) } //------------------------------------------------------------------------------------------------- -typedef std::set > MapNameList; +typedef std::set/**/> MapNameList; typedef std::map MapDisplayToFileNameList; static void buildMapListForNumPlayers(MapNameList &outMapNames, MapDisplayToFileNameList &outFileNames, Int numPlayers) diff --git a/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h index 2f4b2d7f66b..4c4a076be4c 100644 --- a/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h +++ b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h @@ -98,7 +98,7 @@ struct OpenAudioFile const AudioEventInfo *m_eventInfo; // Not mutable, unlike the one on AudioEventRTS. }; -typedef std::hash_map< AsciiString, OpenAudioFile, rts::hash, rts::equal_to > OpenFilesHash; +typedef std::hash_map< AsciiString, OpenAudioFile, rts::hash, rts::equal_to/**/> OpenFilesHash; typedef OpenFilesHash::iterator OpenFilesHashIt; class AudioFileCache diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h index e2f590b67fa..9defb85d715 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -135,7 +135,7 @@ struct PristineBoneInfo Int boneIndex; }; //typedef std::hash_map< NameKeyType, PristineBoneInfo, rts::hash, rts::equal_to > PristineBoneInfoMap; -typedef std::map< NameKeyType, PristineBoneInfo, std::less > PristineBoneInfoMap; +typedef std::map< NameKeyType, PristineBoneInfo, std::less/**/> PristineBoneInfoMap; //------------------------------------------------------------------------------------------------- @@ -268,7 +268,7 @@ typedef std::vector ModelConditionVector; //------------------------------------------------------------------------------------------------- //typedef std::hash_map< TransitionSig, ModelConditionInfo, std::hash, std::equal_to > TransitionMap; -typedef std::map< TransitionSig, ModelConditionInfo, std::less > TransitionMap; +typedef std::map< TransitionSig, ModelConditionInfo, std::less/**/> TransitionMap; //------------------------------------------------------------------------------------------------- // this is more efficient and also helps solve a projectile-launch-offset problem for double-upgraded diff --git a/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp index d76113e8342..b4cb2bd2ce4 100644 --- a/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp +++ b/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp @@ -3014,7 +3014,7 @@ void MilesAudioManager::friend_forcePlayAudioEventRTS(const AudioEventRTS* event event.generateFilename(); event.generatePlayInfo(); - std::list >::iterator it; + std::list/**/>::iterator it; for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) { if (it->first == event.getEventName()) { event.setVolume(it->second); diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h index 391917269fd..4f45017c96f 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h @@ -141,12 +141,12 @@ struct AUDIO_CALLBACK_STRUCT // Protected structures ///////////////////////////////////////////////////////////////////////////////// template -class AudioCallbackListClass : public SimpleDynVecClass< AUDIO_CALLBACK_STRUCT > +class AudioCallbackListClass : public SimpleDynVecClass< AUDIO_CALLBACK_STRUCT/**/> { - using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT >::Vector; - using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT >::ActiveCount; - using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT >::Delete; - using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT >::Add; + using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT/**/>::Vector; + using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT/**/>::ActiveCount; + using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT/**/>::Delete; + using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT/**/>::Add; public: diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h index 3dda58f2068..51fb44304e6 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h +++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h @@ -206,7 +206,7 @@ class DbgHelpLoader MiniDumpWriteDump_t m_miniDumpWriteDump; #endif - typedef std::set, stl::system_allocator > Processes; + typedef std::set, stl::system_allocator/**/> Processes; Processes m_initializedProcesses; HMODULE m_dllModule; diff --git a/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h b/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h index bb76c2f507f..5dae677abe8 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h +++ b/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h @@ -124,21 +124,21 @@ Iter advance_in_range(Iter first, Iter last, ptrdiff_t n) } template -range > get_range(std::multimap& mm, const Key& key, ptrdiff_t n = 0) +range/**/> get_range(std::multimap& mm, const Key& key, ptrdiff_t n = 0) { typedef typename std::multimap::iterator Iter; const std::pair pair = mm.equal_range(key); const Iter it = advance_in_range(pair.first, pair.second, n); - return range >(it, pair.second); + return range/**/>(it, pair.second); } template -const_range > get_range(const std::multimap& mm, const Key& key, ptrdiff_t n = 0) +const_range/**/> get_range(const std::multimap& mm, const Key& key, ptrdiff_t n = 0) { typedef typename std::multimap::const_iterator Iter; const std::pair pair = mm.equal_range(key); const Iter it = advance_in_range(pair.first, pair.second, n); - return const_range >(it, pair.second); + return const_range/**/>(it, pair.second); } } // namespace stl diff --git a/Core/Tools/matchbot/wlib/ustring.h b/Core/Tools/matchbot/wlib/ustring.h index c06e0d06744..bee3ac0ba4b 100644 --- a/Core/Tools/matchbot/wlib/ustring.h +++ b/Core/Tools/matchbot/wlib/ustring.h @@ -32,7 +32,7 @@ #define MAX_BYTES_PER_CHAR 1 template -class UstringT : public basic_string > +class UstringT : public basic_string/**/> { public: explicit UstringT(int max_charlength) { @@ -46,8 +46,8 @@ class UstringT : public basic_string > bool operator==(const UstringT &other) { - const basic_string > *other_basic=&other; - const basic_string > *this_basic=this; + const basic_string/**/> *other_basic=&other; + const basic_string/**/> *this_basic=this; return((*other_basic)==(*this_basic)); } diff --git a/Generals/Code/GameEngine/Include/Common/DamageFX.h b/Generals/Code/GameEngine/Include/Common/DamageFX.h index 4a1ed99b8d7..2802db854bd 100644 --- a/Generals/Code/GameEngine/Include/Common/DamageFX.h +++ b/Generals/Code/GameEngine/Include/Common/DamageFX.h @@ -156,7 +156,7 @@ class DamageFXStore : public SubsystemInterface private: - typedef std::hash_map< NameKeyType, DamageFX, rts::hash, rts::equal_to > DamageFXMap; + typedef std::hash_map< NameKeyType, DamageFX, rts::hash, rts::equal_to/**/> DamageFXMap; DamageFXMap m_dfxmap; }; diff --git a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h index 4a16d318cda..cf6b9447229 100644 --- a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h @@ -113,7 +113,7 @@ class ModuleFactory : public SubsystemInterface, public Snapshot static NameKeyType makeDecoratedNameKey(const AsciiString& name, ModuleType type); - typedef std::map< NameKeyType, ModuleTemplate, std::less > ModuleTemplateMap; + typedef std::map< NameKeyType, ModuleTemplate, std::less/**/> ModuleTemplateMap; typedef std::vector ModuleDataList; ModuleTemplateMap m_moduleTemplateMap; diff --git a/Generals/Code/GameEngine/Include/Common/Player.h b/Generals/Code/GameEngine/Include/Common/Player.h index 43c00857936..5b19a745893 100644 --- a/Generals/Code/GameEngine/Include/Common/Player.h +++ b/Generals/Code/GameEngine/Include/Common/Player.h @@ -147,7 +147,7 @@ struct SpecialPowerReadyTimerType // ------------------------------------------------------------------------------------------------ -typedef std::hash_map< PlayerIndex, Relationship, std::hash, std::equal_to > PlayerRelationMapType; +typedef std::hash_map< PlayerIndex, Relationship, std::hash, std::equal_to/**/> PlayerRelationMapType; class PlayerRelationMap : public MemoryPoolObject, public Snapshot { diff --git a/Generals/Code/GameEngine/Include/Common/Team.h b/Generals/Code/GameEngine/Include/Common/Team.h index 655979d48d8..65c8160b73b 100644 --- a/Generals/Code/GameEngine/Include/Common/Team.h +++ b/Generals/Code/GameEngine/Include/Common/Team.h @@ -42,7 +42,7 @@ typedef UnsignedInt TeamPrototypeID; #define TEAM_PROTOTYPE_ID_INVALID 0 // ------------------------------------------------------------------------------------------------ -typedef std::hash_map< TeamID, Relationship, std::hash, std::equal_to > TeamRelationMapType; +typedef std::hash_map< TeamID, Relationship, std::hash, std::equal_to/**/> TeamRelationMapType; class TeamRelationMap : public MemoryPoolObject, public Snapshot { @@ -733,7 +733,7 @@ class TeamFactory : public SubsystemInterface, private: - typedef std::map< NameKeyType, TeamPrototype*, std::less > TeamPrototypeMap; + typedef std::map< NameKeyType, TeamPrototype*, std::less/**/> TeamPrototypeMap; TeamPrototypeMap m_prototypes; TeamPrototypeID m_uniqueTeamPrototypeID; ///< used to assign unique ids to each team prototype diff --git a/Generals/Code/GameEngine/Include/Common/ThingFactory.h b/Generals/Code/GameEngine/Include/Common/ThingFactory.h index b65e08460ad..fa4dad52db0 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ThingFactory.h @@ -44,7 +44,7 @@ class Object; class Drawable; class INI; -typedef std::hash_map, rts::equal_to > ThingTemplateHashMap; +typedef std::hash_map, rts::equal_to/**/> ThingTemplateHashMap; typedef ThingTemplateHashMap::iterator ThingTemplateHashMapIt; //------------------------------------------------------------------------------------------------- /** Implementation of the thing manager interface singleton */ diff --git a/Generals/Code/GameEngine/Include/GameClient/GameClient.h b/Generals/Code/GameEngine/Include/GameClient/GameClient.h index 7183371d887..0cded9fdd18 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameClient.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameClient.h @@ -54,7 +54,7 @@ struct RayEffectData; /// Function pointers for use by GameClient callback functions. typedef void (*GameClientFuncPtr)( Drawable *draw, void *userData ); -typedef std::hash_map, rts::equal_to > DrawablePtrHash; +typedef std::hash_map, rts::equal_to/**/> DrawablePtrHash; typedef DrawablePtrHash::iterator DrawablePtrHashIt; //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Armor.h b/Generals/Code/GameEngine/Include/GameLogic/Armor.h index ffa97d84b2c..121e12f6864 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Armor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Armor.h @@ -121,7 +121,7 @@ class ArmorStore : public SubsystemInterface private: - typedef std::hash_map< NameKeyType, ArmorTemplate, rts::hash, rts::equal_to > ArmorTemplateMap; + typedef std::hash_map< NameKeyType, ArmorTemplate, rts::hash, rts::equal_to/**/> ArmorTemplateMap; ArmorTemplateMap m_armorTemplates; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h index 2aac21da376..9a2b2dbdda7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -88,7 +88,7 @@ enum /// Function pointers for use by GameLogic callback functions. typedef void (*GameLogicFuncPtr)( Object *obj, void *userData ); -typedef std::hash_map, rts::equal_to > ObjectPtrHash; +typedef std::hash_map, rts::equal_to/**/> ObjectPtrHash; typedef ObjectPtrHash::const_iterator ObjectPtrIter; typedef std::vector ObjectPtrVector; @@ -292,13 +292,13 @@ class GameLogic : public SubsystemInterface, public Snapshot overrides to thing template buildable status. doesn't really belong here, but has to go somewhere. (srj) */ - typedef std::hash_map< AsciiString, BuildableStatus, rts::hash, rts::equal_to > BuildableMap; + typedef std::hash_map< AsciiString, BuildableStatus, rts::hash, rts::equal_to/**/> BuildableMap; BuildableMap m_thingTemplateBuildableOverrides; /** overrides to control bars. doesn't really belong here, but has to go somewhere. (srj) */ - typedef std::hash_map< AsciiString, ConstCommandButtonPtr, rts::hash, rts::equal_to > ControlBarOverrideMap; + typedef std::hash_map< AsciiString, ConstCommandButtonPtr, rts::hash, rts::equal_to/**/> ControlBarOverrideMap; ControlBarOverrideMap m_controlBarOverrides; Real m_width, m_height; ///< Dimensions of the world diff --git a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h index 22ab24b7e6e..7787ba89436 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -484,7 +484,7 @@ class LocomotorStore : public SubsystemInterface private: - typedef std::map< NameKeyType, LocomotorTemplate*, std::less > LocomotorTemplateMap; + typedef std::map< NameKeyType, LocomotorTemplate*, std::less/**/> LocomotorTemplateMap; LocomotorTemplateMap m_locomotorTemplates; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index 66fd996b7d3..8050b13518a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -184,7 +184,7 @@ enum MoodActionAdjustment CPP_11(: Int) //------------------------------------------------------------------------------------------------- typedef std::vector< const LocomotorTemplate* > LocomotorTemplateVector; -typedef std::map< LocomotorSetType, LocomotorTemplateVector, std::less > LocomotorTemplateMap; +typedef std::map< LocomotorSetType, LocomotorTemplateVector, std::less/**/> LocomotorTemplateMap; //------------------------------------------------------------------------------------------------- class AIUpdateModuleData : public UpdateModuleData diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h index 850a4332e27..43ad968ed90 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -238,7 +238,7 @@ class OpenContain : public UpdateModule, UnsignedInt m_containListSize; ///< size of contained list private: - typedef std::map< ObjectID, ObjectEnterExitType, std::less > ObjectEnterExitMap; + typedef std::map< ObjectID, ObjectEnterExitType, std::less/**/> ObjectEnterExitMap; ObjectEnterExitMap m_objectEnterExitInfo; UnsignedInt m_stealthUnitsContained; ///< number of stealth units that can't be seen by enemy players. diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index b403756bd17..11913483e7c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -205,7 +205,7 @@ class ObjectCreationListStore : public SubsystemInterface private: - typedef std::map< NameKeyType, ObjectCreationList, std::less > ObjectCreationListMap; + typedef std::map< NameKeyType, ObjectCreationList, std::less/**/> ObjectCreationListMap; ObjectCreationListMap m_ocls; // note, this list doesn't own the nuggets; all nuggets are owned by the Store. diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h index ef943a40cc5..73dc8796c71 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -99,7 +99,7 @@ typedef std::pair PairAsciiStringUINT; typedef std::list ListAsciiStringUINT; typedef ListAsciiStringUINT::iterator ListAsciiStringUINTIt; -typedef std::map< const ThingTemplate *, Int, std::less > AttackPriorityMap; +typedef std::map< const ThingTemplate *, Int, std::less/**/> AttackPriorityMap; typedef std::pair AsciiStringObjectIDPair; typedef std::list ListAsciiStringObjectID; typedef std::list::iterator ListAsciiStringObjectIDIt; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h index c0408a1c25d..6f5f44336c4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h @@ -864,7 +864,7 @@ class WeaponStore : public SubsystemInterface std::vector m_weaponTemplateVector; // TheSuperHackers @performance IamInnocent 01/01/2026 - Now additionally stores the same weapon templates in a hash map to optimize lookups by name key - typedef std::hash_map, rts::equal_to > WeaponTemplateMap; + typedef std::hash_map, rts::equal_to/**/> WeaponTemplateMap; WeaponTemplateMap m_weaponTemplateHashMap; std::list m_weaponDDI; diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp index 31309766627..74072ae5a1d 100644 --- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -209,7 +209,7 @@ void InitPrecisionTimer() /*static*/ Bool AutoPerfGatherIgnore::s_ignoring = false; //------------------------------------------------------------------------------------------------- -typedef std::vector< std::pair< AsciiString, AsciiString > > StringPairVec; +typedef std::vector< std::pair< AsciiString, AsciiString >/**/> StringPairVec; //------------------------------------------------------------------------------------------------- // PerfMetrics class. Basically, request a handle with your name and it will return. We use a vector diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h index 031efe9c22e..f6775966e7b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -39,7 +39,7 @@ UnicodeString GetDisplayNameFromPair(const PairNameDisplayName *pNamePair); class GroveOptions : public COptionsPanel { protected: - std::vector > mVecGroup; + std::vector/**/> mVecGroup; VecPairNameDisplayName mVecDisplayNames; Int mNumTrees; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h index 9db1cf06fdb..070273db719 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h @@ -156,7 +156,7 @@ class DamageFXStore : public SubsystemInterface private: - typedef std::hash_map< NameKeyType, DamageFX, rts::hash, rts::equal_to > DamageFXMap; + typedef std::hash_map< NameKeyType, DamageFX, rts::hash, rts::equal_to/**/> DamageFXMap; DamageFXMap m_dfxmap; }; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h index 381964c068c..48426d40d49 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h @@ -113,7 +113,7 @@ class ModuleFactory : public SubsystemInterface, public Snapshot static NameKeyType makeDecoratedNameKey(const AsciiString& name, ModuleType type); - typedef std::map< NameKeyType, ModuleTemplate, std::less > ModuleTemplateMap; + typedef std::map< NameKeyType, ModuleTemplate, std::less/**/> ModuleTemplateMap; typedef std::vector ModuleDataList; ModuleTemplateMap m_moduleTemplateMap; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Player.h b/GeneralsMD/Code/GameEngine/Include/Common/Player.h index 612560c1b10..d8c7940bb66 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Player.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Player.h @@ -148,7 +148,7 @@ struct SpecialPowerReadyTimerType // ------------------------------------------------------------------------------------------------ -typedef std::hash_map< PlayerIndex, Relationship, std::hash, std::equal_to > PlayerRelationMapType; +typedef std::hash_map< PlayerIndex, Relationship, std::hash, std::equal_to/**/> PlayerRelationMapType; class PlayerRelationMap : public MemoryPoolObject, public Snapshot { diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Team.h b/GeneralsMD/Code/GameEngine/Include/Common/Team.h index a9deba8c0d4..64365defa95 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Team.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Team.h @@ -42,7 +42,7 @@ typedef UnsignedInt TeamPrototypeID; #define TEAM_PROTOTYPE_ID_INVALID 0 // ------------------------------------------------------------------------------------------------ -typedef std::hash_map< TeamID, Relationship, std::hash, std::equal_to > TeamRelationMapType; +typedef std::hash_map< TeamID, Relationship, std::hash, std::equal_to/**/> TeamRelationMapType; class TeamRelationMap : public MemoryPoolObject, public Snapshot { @@ -733,7 +733,7 @@ class TeamFactory : public SubsystemInterface, private: - typedef std::map< NameKeyType, TeamPrototype*, std::less > TeamPrototypeMap; + typedef std::map< NameKeyType, TeamPrototype*, std::less/**/> TeamPrototypeMap; TeamPrototypeMap m_prototypes; TeamPrototypeID m_uniqueTeamPrototypeID; ///< used to assign unique ids to each team prototype diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h index e1b29581c64..8fdb75e8937 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h @@ -44,7 +44,7 @@ class Object; class Drawable; class INI; -typedef std::hash_map, rts::equal_to > ThingTemplateHashMap; +typedef std::hash_map, rts::equal_to/**/> ThingTemplateHashMap; typedef ThingTemplateHashMap::iterator ThingTemplateHashMapIt; //------------------------------------------------------------------------------------------------- /** Implementation of the thing manager interface singleton */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h index 62ade9d5ee1..8dd29c5a677 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h @@ -121,7 +121,7 @@ class ArmorStore : public SubsystemInterface private: - typedef std::hash_map< NameKeyType, ArmorTemplate, rts::hash, rts::equal_to > ArmorTemplateMap; + typedef std::hash_map< NameKeyType, ArmorTemplate, rts::hash, rts::equal_to/**/> ArmorTemplateMap; ArmorTemplateMap m_armorTemplates; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h index 03899472123..bac39ad8cef 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -302,13 +302,13 @@ class GameLogic : public SubsystemInterface, public Snapshot overrides to thing template buildable status. doesn't really belong here, but has to go somewhere. (srj) */ - typedef std::hash_map< AsciiString, BuildableStatus, rts::hash, rts::equal_to > BuildableMap; + typedef std::hash_map< AsciiString, BuildableStatus, rts::hash, rts::equal_to/**/> BuildableMap; BuildableMap m_thingTemplateBuildableOverrides; /** overrides to control bars. doesn't really belong here, but has to go somewhere. (srj) */ - typedef std::hash_map< AsciiString, ConstCommandButtonPtr, rts::hash, rts::equal_to > ControlBarOverrideMap; + typedef std::hash_map< AsciiString, ConstCommandButtonPtr, rts::hash, rts::equal_to/**/> ControlBarOverrideMap; ControlBarOverrideMap m_controlBarOverrides; Real m_width, m_height; ///< Dimensions of the world diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h index 59c4e908f47..2db72c27d7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -502,7 +502,7 @@ class LocomotorStore : public SubsystemInterface private: - typedef std::map< NameKeyType, LocomotorTemplate*, std::less > LocomotorTemplateMap; + typedef std::map< NameKeyType, LocomotorTemplate*, std::less/**/> LocomotorTemplateMap; LocomotorTemplateMap m_locomotorTemplates; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index a475e3d40b1..4aa0483c815 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -185,7 +185,7 @@ enum MoodActionAdjustment CPP_11(: Int) //------------------------------------------------------------------------------------------------- typedef std::vector< const LocomotorTemplate* > LocomotorTemplateVector; -typedef std::map< LocomotorSetType, LocomotorTemplateVector, std::less > LocomotorTemplateMap; +typedef std::map< LocomotorSetType, LocomotorTemplateVector, std::less/**/> LocomotorTemplateMap; //------------------------------------------------------------------------------------------------- class AIUpdateModuleData : public UpdateModuleData diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h index 0c447408c29..c3c3f1f99bb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -259,7 +259,7 @@ class OpenContain : public UpdateModule, UnsignedInt m_containListSize; ///< size of contained list private: - typedef std::map< ObjectID, ObjectEnterExitType, std::less > ObjectEnterExitMap; + typedef std::map< ObjectID, ObjectEnterExitType, std::less/**/> ObjectEnterExitMap; ObjectEnterExitMap m_objectEnterExitInfo; UnsignedInt m_stealthUnitsContained; ///< number of stealth units that can't be seen by enemy players. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index b156d47f517..8e164795d0f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -205,7 +205,7 @@ class ObjectCreationListStore : public SubsystemInterface private: - typedef std::map< NameKeyType, ObjectCreationList, std::less > ObjectCreationListMap; + typedef std::map< NameKeyType, ObjectCreationList, std::less/**/> ObjectCreationListMap; ObjectCreationListMap m_ocls; // note, this list doesn't own the nuggets; all nuggets are owned by the Store. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h index a6ce0c38a7d..3ed3d9fc00c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -99,7 +99,7 @@ typedef std::pair PairAsciiStringUINT; typedef std::list ListAsciiStringUINT; typedef ListAsciiStringUINT::iterator ListAsciiStringUINTIt; -typedef std::map< const ThingTemplate *, Int, std::less > AttackPriorityMap; +typedef std::map< const ThingTemplate *, Int, std::less/**/> AttackPriorityMap; typedef std::pair AsciiStringObjectIDPair; typedef std::list ListAsciiStringObjectID; typedef std::list::iterator ListAsciiStringObjectIDIt; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h index 753015dccea..c5997707ba7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h @@ -889,7 +889,7 @@ class WeaponStore : public SubsystemInterface std::vector m_weaponTemplateVector; // TheSuperHackers @performance IamInnocent 01/01/2026 - Now additionally stores the same weapon templates in a hash map to optimize lookups by name key - typedef std::hash_map, rts::equal_to > WeaponTemplateMap; + typedef std::hash_map, rts::equal_to/**/> WeaponTemplateMap; WeaponTemplateMap m_weaponTemplateHashMap; std::list m_weaponDDI; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp index b0a8151acf0..8f3b54f54a8 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -209,7 +209,7 @@ void InitPrecisionTimer() /*static*/ Bool AutoPerfGatherIgnore::s_ignoring = false; //------------------------------------------------------------------------------------------------- -typedef std::vector< std::pair< AsciiString, AsciiString > > StringPairVec; +typedef std::vector< std::pair< AsciiString, AsciiString >/**/> StringPairVec; //------------------------------------------------------------------------------------------------- // PerfMetrics class. Basically, request a handle with your name and it will return. We use a vector diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h index 4b607bc6bab..9aa5f24dd4a 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -149,7 +149,7 @@ class HierarchyView } }; - typedef std::hash_map< ConstGameWindowPtr, HTREEITEM, hashConstGameWindowPtr, std::equal_to > TreeHash; + typedef std::hash_map< ConstGameWindowPtr, HTREEITEM, hashConstGameWindowPtr, std::equal_to/**/> TreeHash; TreeHash m_treeHash; ///< Speed up the search with a nice hash. #endif diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h index ae70c511665..0e70e91697e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -39,7 +39,7 @@ UnicodeString GetDisplayNameFromPair(const PairNameDisplayName *pNamePair); class GroveOptions : public COptionsPanel { protected: - std::vector > mVecGroup; + std::vector/**/> mVecGroup; VecPairNameDisplayName mVecDisplayNames; Int mNumTrees;