From e6431a9fd4abdf36c7a70ec09d294226820406fe Mon Sep 17 00:00:00 2001 From: Anonymous Date: Thu, 23 Jan 2014 08:55:46 -0700 Subject: [PATCH] Minor fixes including removing <> from make_pair usage and using explicit conversions where required by the explicit constructor flags Now builds/runs using c++11 --- .../library/serverGame/src/shared/ai/Squad.cpp | 4 ++-- .../src/shared/command/CommandQueueEntry.h | 2 +- .../src/shared/network/CentralConnection.cpp | 4 ++-- .../src/shared/object/PlanetObject.cpp | 6 +++--- .../src/shared/object/PlayerQuestObject.cpp | 6 +++--- .../src/shared/object/TangibleObject.cpp | 8 ++++---- .../src/shared/ScriptMethodsObjectInfo.cpp | 4 ++-- .../serverUtility/src/shared/PopulationList.cpp | 2 +- .../src/shared/StlForwardDeclaration.h | 16 ---------------- .../sharedGame/src/shared/core/AiDebugString.cpp | 4 ++-- .../src/shared/object/AppearanceManager.cpp | 2 +- .../sharedMemoryManager/src/linux/OsNewDel.cpp | 10 +++++----- .../sharedMemoryManager/src/linux/OsNewDel.h | 11 ++++++----- .../shared/appearance/AppearanceTemplateList.cpp | 4 ++-- 14 files changed, 34 insertions(+), 49 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/ai/Squad.cpp b/engine/server/library/serverGame/src/shared/ai/Squad.cpp index 34f645e1..caced74f 100644 --- a/engine/server/library/serverGame/src/shared/ai/Squad.cpp +++ b/engine/server/library/serverGame/src/shared/ai/Squad.cpp @@ -180,7 +180,7 @@ void Squad::addUnit(NetworkId const & unit) //-- Add the unit to the new squad - IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, &PersistentCrcString::empty))); + IGNORE_RETURN(m_unitMap->insert(std::make_pair(CachedNetworkId(unit), &PersistentCrcString::empty))); if (leader) { @@ -419,7 +419,7 @@ void Squad::buildFormation() NetworkId const & unit = iterSortedUnitList->second.first; PersistentCrcString const * unitName = iterSortedUnitList->second.second; - IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, unitName))); + IGNORE_RETURN(m_unitMap->insert(std::make_pair(CachedNetworkId(unit), unitName))); } m_formation.build(*this); diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h b/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h index 035529f2..953dec2c 100644 --- a/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h +++ b/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h @@ -29,7 +29,7 @@ public: uint32 sequenceId, bool clearable, Command::Priority, - bool auto ); + bool autoAttack ); CommandQueueEntry(CommandQueueEntry const &entry); CommandQueueEntry& operator=(CommandQueueEntry const &); diff --git a/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp b/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp index f10a6dc5..0bdc9431 100644 --- a/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp +++ b/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp @@ -168,12 +168,12 @@ void CentralServerConnection::onReceive(const Archive::ByteStream & message) // return an appropriate response. if( object && object->isAuthoritative() ) { - GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, true ) ); + GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair( msg.getValue().second, true ) ); GameServer::getInstance().sendToCentralServer( rmsg ); } else { - GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, false ) ); + GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair( msg.getValue().second, false ) ); GameServer::getInstance().sendToCentralServer( rmsg ); } } diff --git a/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp index 2e14025d..56e4b737 100644 --- a/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp @@ -108,20 +108,20 @@ namespace PlanetObjectNamespace if(index == std::string::npos) { - parsedVector.push_back(std::make_pair(eventString, 0)); + parsedVector.push_back(std::make_pair(eventString, 0)); return; } while(index != std::string::npos) { std::string subString = eventString.substr(offset, (index - offset)); - parsedVector.push_back(std::make_pair(subString, index)); + parsedVector.push_back(std::make_pair(subString, index)); offset = index + 1; index = eventString.find(delimiter, offset); } std::string subString = eventString.substr(offset, eventString.size()); - parsedVector.push_back(std::make_pair(subString, index)); + parsedVector.push_back(std::make_pair(subString, index)); } const char * makeCopyOfString(const char * rhs) diff --git a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp index edf50d8d..54e63df9 100644 --- a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp @@ -279,7 +279,7 @@ void PlayerQuestObject::addNewTask(std::string title, std::string description, i { m_taskStatus.push_back(0); - m_taskCounters.push_back(std::make_pair(0, counterMax)); + m_taskCounters.push_back(std::make_pair(0, counterMax)); m_waypoints.push_back(waypoint); @@ -315,7 +315,7 @@ void PlayerQuestObject::readInObjVarData() std::vector maxValues; if(getObjVars().getItem(s_taskMaxCounterObjVar, maxValues)) for(std::vector::size_type i = 0; i < counters.size(); ++i) - m_taskCounters.push_back(std::make_pair(counters[i], maxValues[i])); + m_taskCounters.push_back(std::make_pair(counters[i], maxValues[i])); } // Task Status @@ -463,7 +463,7 @@ std::string const & PlayerQuestObject::getTaskDescription(int index) void PlayerQuestObject::setTaskCounter(int index, int value) { int maxValue = m_taskCounters.get()[index].second; - m_taskCounters.set(static_cast(index), std::make_pair(value, maxValue)); + m_taskCounters.set(static_cast(index), std::make_pair(value, maxValue)); saveDataToObjVars(); } diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp index ba4dac2a..6d58c476 100644 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp @@ -6190,7 +6190,7 @@ void TangibleObject::addUserToAccessList(const NetworkId user) } else { - sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user) ) ); + sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user) ) ); } } @@ -6210,7 +6210,7 @@ void TangibleObject::addGuildToAccessList(int guildId) } else { - sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid) ) ); + sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid) ) ); } } @@ -6239,7 +6239,7 @@ void TangibleObject::removeUserFromAccessList(const NetworkId user) } else { - sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user))); + sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(-1, user))); } } @@ -6267,7 +6267,7 @@ void TangibleObject::removeGuildFromAccessList(int guildId) } else { - sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid))); + sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair >(std::make_pair(guildId, NetworkId::cms_invalid))); } } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp index 7e1206de..9c4fb1da 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp @@ -6543,7 +6543,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env { SlottedContainmentProperty::SlotArrangement const slots = slottedContainment->getSlotArrangement(slottedContainment->getCurrentArrangement()); // Get the old arrangement for(unsigned int j = 0; j < slots.size(); ++j) - wornObjects.insert(std::make_pair(slots[j], item)); + wornObjects.insert(std::make_pair(slots[j], item)); } } } @@ -6586,7 +6586,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env if(!slotOccupied) { for(unsigned int j = 0; j < slots.size(); ++j) - wornObjects.insert(std::make_pair(slots[j], item)); + wornObjects.insert(std::make_pair(slots[j], item)); } } } diff --git a/engine/server/library/serverUtility/src/shared/PopulationList.cpp b/engine/server/library/serverUtility/src/shared/PopulationList.cpp index 9b5346d9..80db4b1e 100644 --- a/engine/server/library/serverUtility/src/shared/PopulationList.cpp +++ b/engine/server/library/serverUtility/src/shared/PopulationList.cpp @@ -61,7 +61,7 @@ int PopulationList::getNearestPopulation(const std::string &scene, int x, int z) } } } - m_populationCache.insert(std::make_pair(where,population)); + m_populationCache.insert(std::make_pair(where,population)); return population; } } diff --git a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h index 31cbeff4..6883b507 100644 --- a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h +++ b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h @@ -66,22 +66,6 @@ namespace std template class unordered_map; template class unordered_set; } - - template - bool is_sorted (ForwardIterator first, ForwardIterator last) - { - if (first==last) return true; - ForwardIterator next = first; - while (++next!=last) { - if (*next<*first) // or, if (comp(*next,*first)) for version (2) - return false; - - ++first; - } - - return true; - } - } template > struct stddeque diff --git a/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp b/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp index 3f0fe7f6..544cf1af 100644 --- a/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp @@ -543,8 +543,8 @@ void AiDebugString::addCircleAtObjectOffset(NetworkId const & target, Vector con // Object-space circle relative to the target if (radius > 0.0f) - { - m_circleList->push_back(std::make_pair(target, std::make_pair(Circle(position_o, radius), color))); + { + m_circleList->push_back(std::make_pair(CachedNetworkId(target), std::make_pair(Circle(position_o, radius), color))); } else { diff --git a/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp b/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp index 9e6747c0..0ab8b628 100644 --- a/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/object/AppearanceManager.cpp @@ -100,7 +100,7 @@ void AppearanceManager::install() crcStringVector = new CrcStringVector(); crcStringVector->reserve(static_cast(numberOfColumns)); - ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair(new PersistentCrcString(crcSourceName), crcStringVector)); + ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair((const CrcString*)new PersistentCrcString(crcSourceName), crcStringVector)); } } diff --git a/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp b/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp index 553adc93..29280ef8 100644 --- a/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp +++ b/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp @@ -59,35 +59,35 @@ extern "C" // ====================================================================== -void *operator new(size_t size, MemoryManagerNotALeak) throw (std::bad_alloc) +void *operator new(size_t size, MemoryManagerNotALeak) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), false, false); } // ---------------------------------------------------------------------- -void *operator new(size_t size) throw (std::bad_alloc) +void *operator new(std::size_t size) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), false, true); } // ---------------------------------------------------------------------- -void *operator new[](size_t size) throw (std::bad_alloc) +void *operator new[](size_t size) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), true, true); } // ---------------------------------------------------------------------- -void *operator new(size_t size, const char *file, int line) throw (std::bad_alloc) +void *operator new(size_t size, const char *file, int line) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), false, true); } // ---------------------------------------------------------------------- -void *operator new[](size_t size, const char *file, int line) throw (std::bad_alloc) +void *operator new[](size_t size, const char *file, int line) { return MemoryManager::allocate(size, reinterpret_cast(__builtin_return_address(0)), true, true); } diff --git a/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h b/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h index ad3d4df8..46595a62 100644 --- a/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h +++ b/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h @@ -10,17 +10,18 @@ #define INCLUDED_OsNewDel_H // ====================================================================== +#include enum MemoryManagerNotALeak { MM_notALeak }; -void *operator new(size_t size, MemoryManagerNotALeak) throw(std::bad_alloc); -void *operator new(size_t size) throw(std::bad_alloc); -void *operator new[](size_t size) throw(std::bad_alloc); -void *operator new(size_t size, char const *file, int line) throw(std::bad_alloc); -void *operator new[](size_t size, char const *file, int line) throw(std::bad_alloc); +void *operator new(size_t size, MemoryManagerNotALeak); +void *operator new(size_t size); +void *operator new[](std::size_t size); +void *operator new(size_t size, char const *file, int line); +void *operator new[](size_t size, char const *file, int line); void operator delete(void *pointer) throw(); void operator delete[](void *pointer) throw(); diff --git a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp index b0885c86..37ae3c49 100644 --- a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp +++ b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp @@ -630,7 +630,7 @@ void AppearanceTemplateListNamespace::addNamedAppearanceTemplate(AppearanceTempl NOT_NULL(appearanceTemplate); //-- add to named list - std::pair result = ms_namedTemplates.insert(std::make_pair(&appearanceTemplate->getCrcName(), appearanceTemplate)); + std::pair result = ms_namedTemplates.insert(std::make_pair((const CrcString*)&appearanceTemplate->getCrcName(), appearanceTemplate)); //-- make sure it's not already there DEBUG_FATAL(!result.second, ("tried to add existing named appearanceTemplate %s", appearanceTemplate->getName())); @@ -649,7 +649,7 @@ void AppearanceTemplateListNamespace::addNamedTimedAppearanceTemplate(Appearance NOT_NULL(appearanceTemplate); //-- add to named list - std::pair result = ms_namedTimedTemplates.insert(std::make_pair(&appearanceTemplate->getCrcName(), std::make_pair(ms_keepTime + Random::randomReal(ms_keepEpsilon), appearanceTemplate))); + std::pair result = ms_namedTimedTemplates.insert(std::make_pair((const CrcString*)&appearanceTemplate->getCrcName(), std::make_pair(ms_keepTime + Random::randomReal(ms_keepEpsilon), appearanceTemplate))); //-- make sure it's not already there DEBUG_FATAL(!result.second, ("tried to add existing named timed appearanceTemplate %s", appearanceTemplate->getName()));