diff --git a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp index 9ffeddbf..0b0a552d 100644 --- a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp @@ -202,7 +202,7 @@ void AggroListProperty::alter() // Once verified for the hate list, we need to give a warning to the target that the // aggro is about to occur - TargetList::iterator iterTargetList = m_targetList.begin(); + TargetList::const_iterator iterTargetList = m_targetList.begin(); for (; iterTargetList != m_targetList.end(); ++iterTargetList) { diff --git a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp index f07d59d3..040d0a9c 100644 --- a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp @@ -2164,7 +2164,7 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) { m_aiDebugStringCrc = crc; - ObserverList::iterator iterObserverList = observerList.begin(); + ObserverList::const_iterator iterObserverList = observerList.begin(); for (; iterObserverList != observerList.end(); ++iterObserverList) { diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp b/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp index 329a0069..b14698b3 100644 --- a/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp @@ -1499,7 +1499,7 @@ void AiShipController::onAttackTargetListEmpty() if ( !guardedByList.empty() && getSquad().isAttackTargetListEmpty()) { - SpaceSquad::SpaceSquadList::iterator iterGuardedByList = guardedByList.begin(); + SpaceSquad::SpaceSquadList::const_iterator iterGuardedByList = guardedByList.begin(); for (; iterGuardedByList != guardedByList.end(); ++iterGuardedByList) { @@ -1677,7 +1677,7 @@ void AiShipController::sendDebugAiToClients(AiDebugString & aiDebugString) { m_aiDebugStringCrc = crc; - ObserverList::iterator iterObserverList = observerList.begin(); + ObserverList::const_iterator iterObserverList = observerList.begin(); for (; iterObserverList != observerList.end(); ++iterObserverList) { diff --git a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp index c4a0dd5c..8cf03ed4 100644 --- a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp @@ -230,7 +230,7 @@ void AttribModNameManager::sendAllNamesToServer(std::vector const & serv { // get the set of non-base names we know about std::set unique; - for (Names::const_reverse_iterator i = m_names->rbegin(); i != m_names->rend(); ++i) + for (Names::reverse_iterator i = m_names->rbegin(); i != m_names->rend(); ++i) unique.insert(*i); if (!unique.empty()) diff --git a/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp b/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp index f99f265d..dd024fed 100644 --- a/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp +++ b/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp @@ -17,6 +17,7 @@ #include "sharedLog/Log.h" #include "sharedNetworkMessages/GenericValueTypeMessage.h" #include +#include // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp b/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp index fbf589a1..3a9ba6d1 100644 --- a/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp @@ -11,6 +11,7 @@ #include "sharedObject/ObjectTemplateList.h" #include "sharedUtility/DataTableManager.h" +#include #include //------------------------------------------------------------------------------------------ diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index ece29b65..6313f0e8 100644 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -13368,7 +13368,7 @@ void CreatureObject::removeMissionCriticalObject(NetworkId const & networkId) { if (isAuthoritative()) { - MissionCriticalObjectSet::iterator iter = m_missionCriticalObjectSet.find(networkId); + MissionCriticalObjectSet::const_iterator iter = m_missionCriticalObjectSet.find(networkId); if (iter != m_missionCriticalObjectSet.end()) { m_missionCriticalObjectSet.erase(iter); @@ -13421,7 +13421,7 @@ void CreatureObject::setGroupMissionCriticalObjects(GroupMissionCriticalObjectSe //-- Anything that is not in the original set, we need to remove { - for (GroupMissionCriticalObjectSet::iterator iter = m_groupMissionCriticalObjectSet.begin(); iter != m_groupMissionCriticalObjectSet.end(); ++iter) + for (GroupMissionCriticalObjectSet::const_iterator iter(m_groupMissionCriticalObjectSet.begin()); iter != m_groupMissionCriticalObjectSet.end(); ++iter) if (groupMissionCriticalObjectSet.find(*iter) == groupMissionCriticalObjectSet.end()) m_groupMissionCriticalObjectSet.erase(*iter); } @@ -14622,7 +14622,7 @@ bool CreatureObject::clearAllExpertises() //@TODO: guard this however design wants const SkillList &skills = getSkillList(); std::vector skillsToRevoke; - for(std::set::iterator i = skills.begin(); i != skills.end(); ++i) + for(std::set::const_iterator i(skills.begin()); i != skills.end(); ++i) { const SkillObject *skill = *i; if(skill && ExpertiseManager::isExpertise(skill)) diff --git a/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp index 3287ec67..de1363fc 100644 --- a/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp +++ b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp @@ -1141,8 +1141,7 @@ EnvironmentInfo RegionMasterNamspace::convertFromStringToEnvironmentInfo(std::st // Now we just search our map for the strings we just read in. If we find it, we add that flag to our output value. for(std::vector::size_type i = 0; i < parsedStringVector.size(); ++i) { - std::map::iterator searchIter = NULL; - searchIter = s_conversionMap.find(parsedStringVector[i]); + std::map::iterator searchIter = s_conversionMap.find(parsedStringVector[i]); if( searchIter != s_conversionMap.end()) { diff --git a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp index a4ec08d2..e64fafaf 100644 --- a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp @@ -447,7 +447,7 @@ void Node::getAllVisibleObjects(std::vector & results) const { results.reserve(results.size() + m_visibleObjects.size()); - for (ObjectSet::iterator i=m_visibleObjects.begin(); i!=m_visibleObjects.end(); ++i) + for (ObjectSet::const_iterator i=m_visibleObjects.begin(); i!=m_visibleObjects.end(); ++i) { NOT_NULL(*i); results.push_back(&((*i)->getServerObject())); diff --git a/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp b/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp index d51dbfb2..622cd443 100644 --- a/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp +++ b/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp @@ -1348,7 +1348,7 @@ CS_CMD( get_pc_info ) const CreatureObject::SkillList & skills = creatureActor->getSkillList(); int temp_int = 0; - for( CreatureObject::SkillList::iterator slit = skills.begin(); + for( CreatureObject::SkillList::const_iterator slit = skills.begin(); slit != skills.end(); ++slit ) {