diff --git a/engine/server/application/CentralServer/src/shared/UniverseManager.h b/engine/server/application/CentralServer/src/shared/UniverseManager.h index b4e2eec3..12676127 100755 --- a/engine/server/application/CentralServer/src/shared/UniverseManager.h +++ b/engine/server/application/CentralServer/src/shared/UniverseManager.h @@ -36,7 +36,7 @@ private: void sendUniverseToServer(uint32 gameServerId); private: - typedef stdset::fwd ServersLoadingUniverseType; + typedef std::set ServersLoadingUniverseType; uint32 m_universeProcess; ///< Process that owns the universe objects bool m_databaseAuthoritative; ///< True if database is authoritative for the universe objects diff --git a/engine/server/application/ChatServer/src/shared/ChatServer.cpp b/engine/server/application/ChatServer/src/shared/ChatServer.cpp index 542cc4cf..2bd3dc6e 100755 --- a/engine/server/application/ChatServer/src/shared/ChatServer.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatServer.cpp @@ -1673,7 +1673,7 @@ void ChatServer::invite(const NetworkId & id, const ChatAvatarId & avatarId, con //----------------------------------------------------------------------- -void ChatServer::inviteGroupMembers(const NetworkId & id, const ChatAvatarId & avatarId, const std::string & roomName, const stdvector::fwd & members) +void ChatServer::inviteGroupMembers(const NetworkId & id, const ChatAvatarId & avatarId, const std::string & roomName, const std::vector & members) { ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "inviteGroupMembers() id(%s) avatarId(%s) roomName(%s) number of members (%u)", id.getValueString().c_str(), avatarId.getFullName().c_str(), roomName.c_str(), members.size()); diff --git a/engine/server/application/ChatServer/src/shared/ChatServer.h b/engine/server/application/ChatServer/src/shared/ChatServer.h index 0baf6191..90e50c37 100755 --- a/engine/server/application/ChatServer/src/shared/ChatServer.h +++ b/engine/server/application/ChatServer/src/shared/ChatServer.h @@ -178,7 +178,7 @@ public: static void disconnectAvatar (const ChatAvatar &); static void disconnectPlayer (const NetworkId &); static void invite (const NetworkId & id, const ChatAvatarId & avatar, const std::string & roomName); - static void inviteGroupMembers (const NetworkId & id, const ChatAvatarId & avatar, const std::string & roomName, const stdvector::fwd & members); + static void inviteGroupMembers (const NetworkId & id, const ChatAvatarId & avatar, const std::string & roomName, const std::vector & members); static void uninvite (const NetworkId & id, const unsigned int sequence, const ChatAvatarId & avatar, const std::string & roomName); static void queryRoom (const NetworkId & id, ConnectionServerConnection * connection, const unsigned int sequence, const std::string & roomName); static void requestRoomList (const NetworkId & id, ConnectionServerConnection * connection); diff --git a/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.h b/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.h index 78b42584..445fee7f 100755 --- a/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.h +++ b/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.h @@ -200,9 +200,9 @@ enum VendorStatusCode AuctionLocation & GetLocation (const std::string & location); AuctionLocation & GetLocation (const NetworkId & location); - void VerifyExcludedGotTypes (stdmap::fwd const & excludedGotTypes); - void VerifyExcludedResourceClasses (stdset::fwd const & excludedResourceClasses); - void SetResourceTreeHierarchy (stdmap::fwd>::fwd const & resourceTreeHierarchy); + void VerifyExcludedGotTypes (std::map const & excludedGotTypes); + void VerifyExcludedResourceClasses (std::set const & excludedResourceClasses); + void SetResourceTreeHierarchy (std::map> const & resourceTreeHierarchy); bool HasReceivedResourceTreeHierarchy() const {return !m_resourceTreeHierarchy.empty();} std::map const & getAuctionsCountByGameObjectType() const { return m_auctionsCountByGameObjectType; } diff --git a/engine/server/application/CommoditiesServer/src/shared/dBBidRecord.h b/engine/server/application/CommoditiesServer/src/shared/dBBidRecord.h index 28cd5b75..571f196b 100755 --- a/engine/server/application/CommoditiesServer/src/shared/dBBidRecord.h +++ b/engine/server/application/CommoditiesServer/src/shared/dBBidRecord.h @@ -30,7 +30,7 @@ struct BidRecord // ====================================================================== -typedef stdvector::fwd BidList; +typedef std::vector BidList; // ====================================================================== diff --git a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h index 07fc38bd..bdb22baf 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h +++ b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h @@ -37,9 +37,9 @@ private: int m_pendingTicketCount; }; - typedef stdunordered_map::fwd ClientConnectionMap; - typedef stdmap::fwd SuidToNetworkIdMap; - typedef stdvector::fwd CategoryList; + typedef std::unordered_map ClientConnectionMap; + typedef std::map SuidToNetworkIdMap; + typedef std::vector CategoryList; CategoryList * const m_englishCategoryList; CSAssistGameAPITrack m_englishCategoryTrack; diff --git a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.h b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.h index a63dd50e..ee0d49d1 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.h +++ b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.h @@ -34,7 +34,7 @@ private: //typedefs - typedef stdset::fwd ConnectionServerSet; + typedef std::set ConnectionServerSet; typedef std::multimap SortedChatLog; //Member variables @@ -65,7 +65,7 @@ private: bool m_gameServerChatLogReceived; }; - typedef stdmap::fwd PendingTicketList; + typedef std::map PendingTicketList; PendingTicketList *m_pendingTicketList; void createTicket(NetworkId const &networkId, const CSAssistGameAPITicket &ticket, Unicode::String const &hiddenDetails, Unicode::String const &harassingPlayerName, const unsigned int suid, const bool logChat); diff --git a/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h b/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h index 330eb9f3..a11330dc 100755 --- a/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h +++ b/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h @@ -137,7 +137,7 @@ class ConfigLoginServer // has character creation for this cluster been disabled through config option static bool isCharacterCreationDisabled(std::string const & cluster); - static stdset::fwd const & getCharacterCreationDisabledClusterList(); + static std::set const & getCharacterCreationDisabledClusterList(); static const int getMaxConnectionsPerIP(); diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.h b/engine/server/application/LoginServer/src/shared/LoginServer.h index f1d4de5b..0d6e9008 100755 --- a/engine/server/application/LoginServer/src/shared/LoginServer.h +++ b/engine/server/application/LoginServer/src/shared/LoginServer.h @@ -66,7 +66,7 @@ public: void sendToCluster (uint32 clusterId, const GameNetworkMessage &message); void sendToAllClusters (GameNetworkMessage const & message, Connection const * excludeCentralConnection = nullptr, uint32 excludeClusterId = 0, char const * excludeClusterName = nullptr); bool areAllClustersUp () const; - void getClusterIds (stdvector::fwd result); + void getClusterIds (std::vector result); void performAccountTransfer (const AvatarList &avatars, TransferAccountData * transferAccountData); void setDone (const bool isDone); diff --git a/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.h b/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.h index d48d81ff..395c0cef 100755 --- a/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.h +++ b/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.h @@ -84,7 +84,7 @@ class PlanetProxyObject void updateContentsTracking (const NetworkId & newContainedBy); private: - typedef stdvector > MessageListType; + typedef std::vector > MessageListType; private: const NetworkId m_objectId; @@ -98,7 +98,7 @@ class PlanetProxyObject int m_objectTypeTag; Node * m_quadtreeNode; unsigned long m_authTransferTimeMs; - stdvector::fwd * m_contents; + std::vector * m_contents; int m_level; bool m_hibernating; uint32 m_templateCrc; diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServer.h b/engine/server/application/PlanetServer/src/shared/PlanetServer.h index 7a75e4fc..592e3ff2 100755 --- a/engine/server/application/PlanetServer/src/shared/PlanetServer.h +++ b/engine/server/application/PlanetServer/src/shared/PlanetServer.h @@ -57,7 +57,7 @@ public: int getObjectCountForServer(uint32 serverId) const; int getInterestObjectCountForServer(uint32 serverId) const; int getInterestCreatureObjectCountForServer(uint32 serverId) const; - void getObjectCountsForAllServers(stdmap::fwd &counts) const; + void getObjectCountsForAllServers(std::map &counts) const; virtual void receiveMessage(const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message); void sendToCentral(const GameNetworkMessage & message, const bool reliable); void sendToGameServer(const uint32 processId, const GameNetworkMessage & message); @@ -106,8 +106,8 @@ private: TaskConnection * m_taskConnection; bool m_done; int m_roundRobinGameServer; - stdmap::fwd * m_pendingServerStarts; // number of game servers to start when central & task manager are ready - stdmap >::fwd * m_startingGameServers; // number of game servers we've started that haven't connected to us yet + std::map * m_pendingServerStarts; // number of game servers to start when central & task manager are ready + std::map > * m_startingGameServers; // number of game servers we've started that haven't connected to us yet uint32 m_firstGameServer; bool m_tutorialMode; bool m_spaceMode; @@ -116,15 +116,15 @@ private: std::vector m_messagesWaitingForGameServer; PlanetServerMetricsData* m_metricsData; TaskConnection* m_taskManagerConnection; - stdlist::fwd *m_sceneTransferChunkLoads; - stdmap::fwd *m_pendingCharacterSaves; + std::list *m_sceneTransferChunkLoads; + std::map *m_pendingCharacterSaves; WatcherList m_watchers; bool m_watcherIsPresent; typedef std::map > QueuedMessagesType; QueuedMessagesType m_queuedMessages; - stdmap::fwd *m_characterFindMap; + std::map *m_characterFindMap; unsigned int m_characterFindSequence; int m_waitForSaveCounter; int m_lastSaveCounter; diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.h b/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.h index ab6b7b19..672167ed 100755 --- a/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.h +++ b/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.h @@ -24,7 +24,7 @@ private: unsigned long m_watcherPort; // used for reporting load time of each game server - stdmap::fwd m_gameServerLoadTime; + std::map m_gameServerLoadTime; private: diff --git a/engine/server/application/PlanetServer/src/shared/PreloadManager.h b/engine/server/application/PlanetServer/src/shared/PreloadManager.h index b13d53cb..7f180c4d 100755 --- a/engine/server/application/PlanetServer/src/shared/PreloadManager.h +++ b/engine/server/application/PlanetServer/src/shared/PreloadManager.h @@ -58,7 +58,7 @@ class PreloadManager : public Singleton2 uint32 getRealServerId (PreloadServerId preloadServerId) const; void getDebugString (std::string &output) const; - typedef stdmap::fwd ServerMapType; + typedef std::map ServerMapType; ServerMapType const * getServerMap () const; private: @@ -67,10 +67,10 @@ class PreloadManager : public Singleton2 private: ServerMapType *m_serverMap; // map of server id in preload list ---> actual server id - typedef stdvector::fwd PreloadListType; + typedef std::vector PreloadListType; PreloadListType *m_preloadList; - typedef stdset::fwd ServersWaitingType; + typedef std::set ServersWaitingType; ServersWaitingType *m_serversWaiting; // set of servers (by list id, not actual id) that still need preloads. bool m_listReceived; diff --git a/engine/server/application/PlanetServer/src/shared/QuadtreeNode.h b/engine/server/application/PlanetServer/src/shared/QuadtreeNode.h index 04b6d719..bd4880df 100755 --- a/engine/server/application/PlanetServer/src/shared/QuadtreeNode.h +++ b/engine/server/application/PlanetServer/src/shared/QuadtreeNode.h @@ -32,7 +32,7 @@ class Node public: void addObject (PlanetProxyObject *newObject); void checkServerAssignment(); - void handleCrash (uint32 crashedServer, stdvector::fwd &subscriptionFixups); + void handleCrash (uint32 crashedServer, std::vector &subscriptionFixups); void load (); void migrateToServer (uint32 newServerId); void load (uint32 serverId); diff --git a/engine/server/application/PlanetServer/src/shared/WatcherConnection.cpp b/engine/server/application/PlanetServer/src/shared/WatcherConnection.cpp index 363b4741..0d0b0103 100755 --- a/engine/server/application/PlanetServer/src/shared/WatcherConnection.cpp +++ b/engine/server/application/PlanetServer/src/shared/WatcherConnection.cpp @@ -83,7 +83,7 @@ void WatcherConnection::flushQueuedObjectData() // ---------------------------------------------------------------------- -void WatcherConnection::addNodeUpdate(int x, int z, bool loaded, const stdvector::fwd &servers, const stdvector::fwd &subscriptionCounts) +void WatcherConnection::addNodeUpdate(int x, int z, bool loaded, const std::vector &servers, const std::vector &subscriptionCounts) { NOT_NULL(m_nodeData); m_nodeData->push_back(PlanetNodeStatusMessageData(x,z,loaded,servers,subscriptionCounts)); diff --git a/engine/server/application/PlanetServer/src/shared/WatcherConnection.h b/engine/server/application/PlanetServer/src/shared/WatcherConnection.h index 6fbf6e01..e5825ccd 100755 --- a/engine/server/application/PlanetServer/src/shared/WatcherConnection.h +++ b/engine/server/application/PlanetServer/src/shared/WatcherConnection.h @@ -26,7 +26,7 @@ class WatcherConnection : public ServerConnection void onConnectionOpened (); void addObjectUpdate (const NetworkId &objectId, int x, int z, uint32 authoritativeServer, int interestRadius, bool deleteObject, int objectTypeTag, int level, bool hibernating, uint32 templateCrc, int aiActivity, int creationType); - void addNodeUpdate (int x, int z, bool loaded, const stdvector::fwd &servers, const stdvector::fwd &subscriptionCounts); + void addNodeUpdate (int x, int z, bool loaded, const std::vector &servers, const std::vector &subscriptionCounts); void flushQueuedData (); private: @@ -34,10 +34,10 @@ class WatcherConnection : public ServerConnection void flushQueuedNodeData(); private: - typedef stdvector::fwd ObjectDataList; + typedef std::vector ObjectDataList; ObjectDataList *m_objectData; - typedef stdvector::fwd NodeDataList; + typedef std::vector NodeDataList; NodeDataList *m_nodeData; private: diff --git a/engine/server/application/TaskManager/src/shared/Locator.h b/engine/server/application/TaskManager/src/shared/Locator.h index 4f588b89..1714a4b5 100755 --- a/engine/server/application/TaskManager/src/shared/Locator.h +++ b/engine/server/application/TaskManager/src/shared/Locator.h @@ -37,7 +37,7 @@ public: static void sendToAllTaskManagers(GameNetworkMessage const &msg); static void updateServerLoad(std::string const &label, float load); static void updateAllLoads(float delta); - static stdmap::fwd const & getClosedConnections(); + static std::map const & getClosedConnections(); }; // ====================================================================== diff --git a/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.h b/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.h index 5c8f253a..2e684677 100755 --- a/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.h +++ b/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.h @@ -25,7 +25,7 @@ class NetworkId; namespace DB { - typedef stdset::fwd TagSet; + typedef std::set TagSet; } // ====================================================================== diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h index 5cc5f2e7..a9558a7d 100755 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h @@ -50,7 +50,7 @@ class DatabaseProcess : public MessageDispatch::Receiver // getters: GameServerConnection * getConnectionByProcess(const uint32 processId); - void getGameServerProcessIds(stdvector::fwd &processIds) const; + void getGameServerProcessIds(std::vector &processIds) const; uint32 getProcessId(void); DB::Server *getDBServer(void); const std::string &getClusterName() const; diff --git a/engine/server/library/serverDatabase/src/shared/GameServerConnection.h b/engine/server/library/serverDatabase/src/shared/GameServerConnection.h index 3c183f01..dda3563b 100755 --- a/engine/server/library/serverDatabase/src/shared/GameServerConnection.h +++ b/engine/server/library/serverDatabase/src/shared/GameServerConnection.h @@ -27,7 +27,7 @@ public: void clearChunkCompleteQueue(); private: - typedef stdvector >::fwd ChunkCompleteQueueType; + typedef std::vector > ChunkCompleteQueueType; ChunkCompleteQueueType * const m_chunkCompleteQueue; private: diff --git a/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.h b/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.h index 1e5ecd5f..26f19670 100755 --- a/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.h +++ b/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.h @@ -28,7 +28,7 @@ class ImmediateDeleteCustomPersistStep : public CustomPersistStep void addObject (const NetworkId &deletedObject); private: - stdset::fwd *m_objects; // using set instead of vector to enforce uniqueness + std::set *m_objects; // using set instead of vector to enforce uniqueness private: ImmediateDeleteCustomPersistStep &operator= (const ImmediateDeleteCustomPersistStep&); //disable diff --git a/engine/server/library/serverDatabase/src/shared/LazyDeleter.h b/engine/server/library/serverDatabase/src/shared/LazyDeleter.h index 7e35e05f..9b8fde84 100755 --- a/engine/server/library/serverDatabase/src/shared/LazyDeleter.h +++ b/engine/server/library/serverDatabase/src/shared/LazyDeleter.h @@ -53,8 +53,8 @@ class LazyDeleter private: static LazyDeleter *ms_instance; Thread *m_workerThread; - stdvector::fwd *m_incomingObjects; - stddeque::fwd *m_objectsToDelete; + std::vector *m_incomingObjects; + std::deque *m_objectsToDelete; Mutex *m_objectListLock; bool m_shutdown; bool m_paused; diff --git a/engine/server/library/serverDatabase/src/shared/MessageToManager.h b/engine/server/library/serverDatabase/src/shared/MessageToManager.h index fa2dada3..c4999aea 100755 --- a/engine/server/library/serverDatabase/src/shared/MessageToManager.h +++ b/engine/server/library/serverDatabase/src/shared/MessageToManager.h @@ -27,7 +27,7 @@ class GameServerConnection; class MessageToManager { public: - typedef stdvector::fwd MessageVector; + typedef std::vector MessageVector; public: static void install(); diff --git a/engine/server/library/serverDatabase/src/shared/Persister.cpp b/engine/server/library/serverDatabase/src/shared/Persister.cpp index 0bf461d8..3d21f5ed 100755 --- a/engine/server/library/serverDatabase/src/shared/Persister.cpp +++ b/engine/server/library/serverDatabase/src/shared/Persister.cpp @@ -5,6 +5,8 @@ // // ====================================================================== +#include + #include "serverDatabase/FirstServerDatabase.h" #include "serverDatabase/Persister.h" @@ -174,33 +176,15 @@ Persister::~Persister() { DEBUG_FATAL(taskQueue,("Call shutdown() before deleting Persister.\n")); - for (auto i=m_currentSnapshots.begin(); i!=m_currentSnapshots.end(); ++i) { + ServerSnapshotMap::iterator i; + for (i=m_currentSnapshots.begin(); i!=m_currentSnapshots.end(); ++i) delete i->second; - i->second = nullptr; - } - - for (auto i=m_newObjectSnapshots.begin(); i!=m_newObjectSnapshots.end(); ++i) { + for (i=m_newObjectSnapshots.begin(); i!=m_newObjectSnapshots.end(); ++i) delete i->second; - i->second = nullptr; - } - - for (auto i=m_savingCharacterSnapshots.begin(); i!=m_savingCharacterSnapshots.end(); ++i) { - delete *i; - *i = nullptr; - } - - for (auto i=m_savingSnapshots.begin(); i!=m_savingSnapshots.end(); ++i) { - delete *i; - *i = nullptr; - } m_currentSnapshots.clear(); m_newObjectSnapshots.clear(); m_objectSnapshotMap.clear(); - m_savingCharacterSnapshots.clear(); - m_savingSnapshots.clear(); - - m_messageSnapshot = nullptr; m_commoditiesSnapshot = nullptr; m_arbitraryGameDataSnapshot = nullptr; @@ -235,18 +219,14 @@ void Persister::onFrameBarrierReached() if (m_newCharacterTaskQueue->getNumPendingTasks() == 0) { ServerSnapshotMap delayedSaves; - + for (ServerSnapshotMap::iterator i=m_newCharacterSnapshots.begin(); i!=m_newCharacterSnapshots.end(); ++i) { if (m_newCharacterLock.find(i->first)==m_newCharacterLock.end()) { DEBUG_REPORT_LOG(ConfigServerDatabase::getReportSaveTimes(),("Starting new character save\n")); - - if (i->second != nullptr) { - m_savingCharacterSnapshots.push_back(i->second); - m_newCharacterTaskQueue->asyncRequest(new TaskSaveSnapshot(i->second)); - } - + m_savingCharacterSnapshots.push_back(i->second); + m_newCharacterTaskQueue->asyncRequest(new TaskSaveSnapshot(i->second)); for (ObjectSnapshotMap::iterator obj=m_objectSnapshotMap.begin(); obj!=m_objectSnapshotMap.end();) { if (obj->second == i->second) @@ -265,7 +245,8 @@ void Persister::onFrameBarrierReached() } // Check for whether it is time to save - FATAL(m_timeSinceLastSave > ConfigServerDatabase::getMaxTimewarp(),("Save was not completed within %i seconds. We may experience a \"time warp\"\n",ConfigServerDatabase::getMaxTimewarp())); + + FATAL(m_timeSinceLastSave > ConfigServerDatabase::getMaxTimewarp(),("Save was not completed within %i seconds. Shutting down to avoid a longer timewarp.\n",ConfigServerDatabase::getMaxTimewarp())); if (ConfigServerDatabase::getSaveAtModulus()!=-1) { @@ -353,19 +334,14 @@ void Persister::startSave(void) ServerSnapshotMap::iterator i; for (i=m_currentSnapshots.begin(); i!=m_currentSnapshots.end(); ++i) { - if (i->second != nullptr) { - m_savingSnapshots.push_back(i->second); - taskQueue->asyncRequest(new TaskSaveSnapshot(i->second)); - } + m_savingSnapshots.push_back(i->second); + taskQueue->asyncRequest(new TaskSaveSnapshot(i->second)); } - for (i=m_newObjectSnapshots.begin(); i!=m_newObjectSnapshots.end(); ++i) - { - if (i->second != nullptr) { - m_savingSnapshots.push_back(i->second); - taskQueue->asyncRequest(new TaskSaveSnapshot(i->second)); - } - } + { + m_savingSnapshots.push_back(i->second); + taskQueue->asyncRequest(new TaskSaveSnapshot(i->second)); + } // nothing changed so send a complete message for the shutdown process if( m_savingSnapshots.empty() ) @@ -619,94 +595,46 @@ void Persister::endBaselines(const NetworkId &objectId, uint32 serverId) // ---------------------------------------------------------------------- - -void Persister::nukeOrphans() { - if (m_completedSnapshots.size() > 0) { - int completeCount = m_completedSnapshots.size(); - int snapshotClassCount = (*m_completedSnapshots.begin())->getPendingCount(); - - WARNING(true, ("%i snapshots done, snapshot class reports %i currently allocated", completeCount, snapshotClassCount)); - - if (snapshotClassCount > 5) { - delmutex.lock(); - - for (auto i = m_completedSnapshots.begin(); i != m_completedSnapshots.end(); ++i) { - if (i != m_completedSnapshots.end() && *i != nullptr && !(*i)->getIsBeingSaved() && completeCount > 5) { - WARNING(true, ("Deleting orphaned snapshot")); - - delete (*i); - *i = nullptr; - - i = m_completedSnapshots.erase(i); - completeCount--; - } else { - break; - } - } - - delmutex.unlock(); - } - } -} - /** * Called by TaskSaveSnapshot when it finishes. */ void Persister::saveCompleted(Snapshot *completedSnapshot) { - nukeOrphans(); - - auto i=std::remove(m_savingSnapshots.begin(),m_savingSnapshots.end(),completedSnapshot); + SnapshotListType::iterator i=std::remove(m_savingSnapshots.begin(),m_savingSnapshots.end(),completedSnapshot); if (i!=m_savingSnapshots.end()) { m_savingSnapshots.erase(i, m_savingSnapshots.end()); - if (m_savingSnapshots.empty() && ConfigServerDatabase::getReportSaveTimes()) - { + } + + if (m_savingSnapshots.empty()) { + if (ConfigServerDatabase::getReportSaveTimes()) { int saveTime = Clock::timeMs() - m_saveStartTime; ++m_saveCount; m_totalSaveTime += saveTime; if (saveTime > m_maxSaveTime) m_maxSaveTime = saveTime; - + DEBUG_REPORT_LOG(true,("Save completed in %i. (Average %i, max %i)\n", saveTime, m_totalSaveTime/m_saveCount, m_maxSaveTime)); LOG("SaveTimes",("Save completed in %i. (Average %i, max %i)", saveTime, m_totalSaveTime/m_saveCount, m_maxSaveTime)); m_lastSaveTime = saveTime; } - if (m_savingSnapshots.empty()) - { - // message Central Server that the current save cycle is complete - GenericValueTypeMessage const saveCompleteMessage("DatabaseSaveComplete", ++m_saveCounter); - DatabaseProcess::getInstance().sendToCentralServer(saveCompleteMessage, true); - LOG("Database",("Sending DatabaseSaveComplete network message to Central.")); - } - - { - // set the last save completion time (for the monitoring program) - time_t theTime = time(0); - m_lastSaveCompletionTime = ctime(&theTime); - } + // message Central Server that the current save cycle is complete + GenericValueTypeMessage const saveCompleteMessage("DatabaseSaveComplete", ++m_saveCounter); + DatabaseProcess::getInstance().sendToCentralServer(saveCompleteMessage, true); + LOG("Database",("Sending DatabaseSaveComplete network message to Central.")); } - else - { - auto j=std::remove(m_savingCharacterSnapshots.begin(),m_savingCharacterSnapshots.end(),completedSnapshot); - if (j != m_savingCharacterSnapshots.end()) { - m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end()); - } else { - DEBUG_WARNING(true,("saveCompleted called w/o snap in m_savingSnapshots or m_savingCharacterSnapshots.")); - } - } - - bool locked = false; - do { - locked = delmutex.try_lock(); - } while (!locked); - - if (completedSnapshot != nullptr){ - m_completedSnapshots.push_back(completedSnapshot); + + // character snapshot deletions seem to work ok, but world and object snaps do not for deletion...wtf + SnapshotListType::iterator j=std::remove(m_savingCharacterSnapshots.begin(),m_savingCharacterSnapshots.end(),completedSnapshot); + if (j != m_savingCharacterSnapshots.end()) { + m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end()); } - delmutex.unlock(); + if (completedSnapshot != nullptr) { + delete completedSnapshot; + completedSnapshot = nullptr; + } } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverDatabase/src/shared/Persister.h b/engine/server/library/serverDatabase/src/shared/Persister.h index 23da2bc3..de62290b 100755 --- a/engine/server/library/serverDatabase/src/shared/Persister.h +++ b/engine/server/library/serverDatabase/src/shared/Persister.h @@ -16,8 +16,6 @@ #include #include //TODO: remove when we clean up newCharacterLock hack -#include - #include "Unicode.h" #include "serverNetworkMessages/MessageToPayload.h" #include "sharedDatabaseInterface/DbModeQuery.h" @@ -71,8 +69,6 @@ class Persister : public MessageDispatch::Receiver void beginBaselines(const NetworkId &newObject) const; void endBaselines(const NetworkId &newObject, uint32 serverId); - - void nukeOrphans(); void saveCompleted (Snapshot *completedSnapshot); void onNewCharacterSaved (uint32 stationId, const NetworkId &characterObject, const Unicode::String &characterName, const int templateId, bool special) const; @@ -101,8 +97,6 @@ class Persister : public MessageDispatch::Receiver DB::TaskQueue *m_newCharacterTaskQueue; private: - std::mutex delmutex; - struct PendingCharacter { uint32 stationId; @@ -122,11 +116,8 @@ class Persister : public MessageDispatch::Receiver ServerSnapshotMap m_newCharacterSnapshots; ObjectSnapshotMap m_objectSnapshotMap; PendingCharactersType m_pendingCharacters; - SnapshotListType m_savingSnapshots; SnapshotListType m_savingCharacterSnapshots; - SnapshotListType m_completedSnapshots; - NewCharacterLockType m_newCharacterLock; CharactersToDeleteType * m_charactersToDeleteThisSaveCycle; CharactersToDeleteType * m_charactersToDeleteNextSaveCycle; @@ -192,7 +183,7 @@ class Persister : public MessageDispatch::Receiver /** * Misc game-specific persistence steps */ - virtual void getMoneyFromOfflineObject(uint32 replyServer, NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector::fwd const & packedDictionary)=0; + virtual void getMoneyFromOfflineObject(uint32 replyServer, NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, std::vector const & packedDictionary)=0; protected: Persister(); diff --git a/engine/server/library/serverDatabase/src/shared/Snapshot.h b/engine/server/library/serverDatabase/src/shared/Snapshot.h index 2c91e729..bf643f80 100755 --- a/engine/server/library/serverDatabase/src/shared/Snapshot.h +++ b/engine/server/library/serverDatabase/src/shared/Snapshot.h @@ -51,7 +51,7 @@ public: virtual void handleAddResourceTypeMessage (const AddResourceTypeMessage &message) =0; virtual void handleBountyHunterTargetMessage (const BountyHunterTargetMessage &message) =0; - virtual void getWorldContainers (stdvector::fwd &containers) const = 0; + virtual void getWorldContainers (std::vector &containers) const = 0; void handleDeltasMessage (NetworkId & objectId, const DeltasMessage &msg); void handleBaselinesMessage (NetworkId & objectId, const BaselinesMessage &msg); @@ -118,10 +118,10 @@ private: virtual void decodeClientData(const NetworkId & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0; virtual void decodeParentClientData(const NetworkId & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0; - virtual bool encodeParentClientData(const NetworkId & objectId, Tag typeId, stdvector::fwd &baselines) const = 0; - virtual bool encodeClientData(const NetworkId & objectId, Tag typeId, stdvector::fwd &baselines) const = 0; - virtual bool encodeServerData(const NetworkId & objectId, Tag typeId, stdvector::fwd &baselines) const = 0; - virtual bool encodeSharedData(const NetworkId & objectId, Tag typeId, stdvector::fwd &baselines) const = 0; + virtual bool encodeParentClientData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const = 0; + virtual bool encodeClientData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const = 0; + virtual bool encodeServerData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const = 0; + virtual bool encodeSharedData(NetworkId const & objectId, Tag typeId, std::vector &baselines) const = 0; private: Snapshot(const Snapshot&); //disable diff --git a/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h b/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h index b3b70720..ed8272d5 100755 --- a/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h +++ b/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h @@ -23,14 +23,14 @@ class WorldContainerLocator : public ObjectLocator { public: - WorldContainerLocator(const stdvector::fwd &containers); + WorldContainerLocator(const std::vector &containers); virtual ~WorldContainerLocator(); public: virtual bool locateObjects(DB::Session *session, const std::string &schema, int &objectsLocated); private: - stdvector::fwd * m_containers; + std::vector * m_containers; private: WorldContainerLocator &operator=(const WorldContainerLocator&); //disable diff --git a/engine/server/library/serverDatabase/src/shared/dBBidRecord.h b/engine/server/library/serverDatabase/src/shared/dBBidRecord.h index bd158ce1..1b5debe7 100755 --- a/engine/server/library/serverDatabase/src/shared/dBBidRecord.h +++ b/engine/server/library/serverDatabase/src/shared/dBBidRecord.h @@ -29,7 +29,7 @@ struct BidRecord // ====================================================================== -typedef stdvector::fwd BidList; +typedef std::vector BidList; // ====================================================================== diff --git a/engine/server/library/serverDatabase/src/shared/dBLocationRecord.h b/engine/server/library/serverDatabase/src/shared/dBLocationRecord.h index feec0939..44141062 100755 --- a/engine/server/library/serverDatabase/src/shared/dBLocationRecord.h +++ b/engine/server/library/serverDatabase/src/shared/dBLocationRecord.h @@ -36,7 +36,7 @@ struct LocationRecord // ====================================================================== -typedef stdvector::fwd LocationList; +typedef std::vector LocationList; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.h b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.h index f74da4d5..a65a117f 100755 --- a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.h +++ b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.h @@ -25,7 +25,7 @@ class AggroListProperty : public Property { public: - typedef stdset::fwd TargetList; + typedef std::set TargetList; static int getAggroListPropertyResetTime(); static AggroListProperty * getAggroListProperty(Object & object); diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h index 9d19106c..174e23ba 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h +++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h @@ -20,7 +20,7 @@ public: struct Action; - typedef stdvector::fwd ActionList; + typedef std::vector ActionList; AiCreatureCombatProfile(); diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h index 4794ff65..1b8f2bda 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h @@ -85,7 +85,7 @@ protected: , BCR_failure }; - typedef stdvector::fwd CachedAiLocations; + typedef std::vector CachedAiLocations; AiLocation m_anchor; AiLocation m_target; diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementMove.h b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.h index a99400e7..f0dff9aa 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementMove.h +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.h @@ -16,7 +16,7 @@ class PathGraph; class PortalProperty; class AiLocation; -typedef stdvector::fwd IndexList; +typedef std::vector IndexList; // ====================================================================== // The simple move behavior moves to the waypoint, and then transitions diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h index 73bf0e4b..f387bd38 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h @@ -11,7 +11,7 @@ #include "serverGame/AiMovementWaypoint.h" -typedef stdlist::fwd AiPath; +typedef std::list AiPath; class ServerPathBuilder; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h index ceb29ea9..7e69113f 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h @@ -58,7 +58,7 @@ public: protected: - stdvector::fwd m_patrolPath; + std::vector m_patrolPath; bool m_random; bool m_flip; bool m_repeat; diff --git a/engine/server/library/serverGame/src/shared/ai/HateList.h b/engine/server/library/serverGame/src/shared/ai/HateList.h index 38a3a685..e6369041 100755 --- a/engine/server/library/serverGame/src/shared/ai/HateList.h +++ b/engine/server/library/serverGame/src/shared/ai/HateList.h @@ -27,9 +27,9 @@ class HateList { public: - typedef stdmap::fwd UnSortedList; - typedef stdvector >::fwd SortedList; - typedef stdset::fwd RecentList; + typedef std::map UnSortedList; + typedef std::vector > SortedList; + typedef std::set RecentList; static float getMaxDistanceToTarget(); @@ -92,7 +92,7 @@ private: Archive::AutoDeltaVariable m_maxHate; Archive::AutoDeltaVariable m_lastUpdateTime; Archive::AutoDeltaVariable m_autoExpireTargetDuration; - stdset::fwd m_recentHateList; // This is used for assist logic + std::set m_recentHateList; // This is used for assist logic }; //---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/ai/Squad.h b/engine/server/library/serverGame/src/shared/ai/Squad.h index 2ad0b511..8f485738 100755 --- a/engine/server/library/serverGame/src/shared/ai/Squad.h +++ b/engine/server/library/serverGame/src/shared/ai/Squad.h @@ -23,8 +23,8 @@ public: friend class SpaceSquadManager; - typedef stdmap::fwd UnitMap; - typedef stdvector::fwd UnitList; + typedef std::map UnitMap; + typedef std::vector UnitList; static void install(); diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h index c4fff9bb..3ba02858 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h @@ -36,8 +36,8 @@ public: AiShipAttackTargetEntry(); }; - typedef stdmap::fwd TargetList; - typedef stdvector >::fwd SortedTargetList; + typedef std::map TargetList; + typedef std::vector > SortedTargetList; public: diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h index 77436c40..40ca39bc 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h @@ -48,7 +48,7 @@ public: // Path management. class Path; - typedef stdvector::fwd PathList; + typedef std::vector PathList; void addPath(Path * path); Path * getCurrentPath(); bool selectNextPath(); diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h index f41594ae..e369b8a0 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h @@ -56,7 +56,7 @@ private: Path(); virtual ~Path(); - typedef stddeque::fwd NodeList; + typedef std::deque NodeList; NodeList * const m_nodeList; private: // Disabled. diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h index a3fcde7b..a840aea2 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h @@ -53,7 +53,7 @@ private: static char const * getDockingStateString(DockingState const dockingState); #endif // _DEBUG - typedef stdlist::fwd HardPointList; + typedef std::list HardPointList; ShipController & m_shipController; CachedNetworkId m_dockTarget; diff --git a/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h index 5db0dc92..86f852ad 100755 --- a/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h +++ b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h @@ -54,7 +54,7 @@ class ShipTurretTargetingSystem bool buildTargetList(); protected: - typedef stdmap::fwd TurretsPerTargetType; + typedef std::map TurretsPerTargetType; private: ShipController & m_shipController; diff --git a/engine/server/library/serverGame/src/shared/city/CityInterface.h b/engine/server/library/serverGame/src/shared/city/CityInterface.h index ac0c3785..19e88a1b 100755 --- a/engine/server/library/serverGame/src/shared/city/CityInterface.h +++ b/engine/server/library/serverGame/src/shared/city/CityInterface.h @@ -25,22 +25,22 @@ class Vector; class CityInterface // static { public: - static stdvector::fwd const &getCitizenOfCityId(NetworkId const &citizenId); + static std::vector const &getCitizenOfCityId(NetworkId const &citizenId); static int getMilitiaOfCityId(NetworkId const &citizenId); - static void getAllCityIds(stdvector::fwd &results); + static void getAllCityIds(std::vector &results); static int findCityByName(std::string const &name); static int findCityByCityHall(NetworkId const &cityHallId); static int getCityAtLocation(std::string const &planetName, int x, int z, int radius); static bool cityExists(int cityId); - static void getCitizenIds(int cityId, stdvector::fwd &results); + static void getCitizenIds(int cityId, std::vector &results); static int getCitizenCount(int cityId); - static void getCityStructureIds(int cityId, stdvector::fwd &results); + static void getCityStructureIds(int cityId, std::vector &results); static CityInfo const &getCityInfo(int cityId); - static stdmap::fwd const &getAllCityInfo(); + static std::map const &getAllCityInfo(); static CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId); - static stdmap, CitizenInfo>::fwd const &getAllCitizensInfo(); + static std::map, CitizenInfo> const &getAllCitizensInfo(); static CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId); - static stdmap, CityStructureInfo>::fwd const & getAllCityStructuresInfo(); + static std::map, CityStructureInfo> const & getAllCityStructuresInfo(); static std::map, uint32> const & getGcwRegionDefenderCities(); static std::map > const & getGcwRegionDefenderCitiesCount(); static int getGcwRegionDefenderCitiesVersion(); @@ -69,7 +69,7 @@ public: static void addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName); static void removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName); static bool hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName); - static void getCitizenRank(int cityId, NetworkId const &citizenId, stdvector::fwd &ranks); + static void getCitizenRank(int cityId, NetworkId const &citizenId, std::vector &ranks); static void setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle); static void setCityStructureInfo(int cityId, NetworkId const &structureId, int structureType, bool structureValid); static void enterCityChatRoom(int cityId, CreatureObject const &who); diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp b/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp index 0e3c1b26..b80d30b3 100755 --- a/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp +++ b/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp @@ -1294,7 +1294,7 @@ void CommandQueue::executeCommand(Command const &command, NetworkId const &targe status = Command::CEC_Success; static bool s_tradeAllowedCommandsInit = false; - typedef stdvector::fwd Uint32Vector; + typedef std::vector Uint32Vector; static Uint32Vector s_tradeAllowedCommands; if (!s_tradeAllowedCommandsInit) diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h index 61f6f688..a3b7b1ab 100755 --- a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h +++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h @@ -86,14 +86,14 @@ public: static void updateVendorStatus(const NetworkId & vendorId, int status); static void updateVendorLocation(const ServerObject & vendor); - static void updateItemTypeMap(int itemTypeMapVersionNumber, const stdmap::fwd >::fwd & itemTypeMap); + static void updateItemTypeMap(int itemTypeMapVersionNumber, const std::map > & itemTypeMap); static void updateItemTypeMap(int itemTypeMapVersionNumber, int itemType, int itemTemplateId); - static const stdmap >::fwd >::fwd & getItemTypeMap(); + static const std::map > > & getItemTypeMap(); static int getItemTypeMapVersionNumber(); - static void updateResourceTypeMap(int resourceTypeMapVersionNumber, const stdmap::fwd >::fwd & resourceTypeMap); + static void updateResourceTypeMap(int resourceTypeMapVersionNumber, const std::map > & resourceTypeMap); static void updateResourceTypeMap(int resourceTypeMapVersionNumber, int resourceClassCrc, const std::string & resourceName); - static const stdmap::fwd >::fwd & getResourceTypeMap(); + static const std::map > & getResourceTypeMap(); static int getResourceTypeMapVersionNumber(); static void sendToCommoditiesServer(const GameNetworkMessage & message); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp index 79de38b7..0bb4706e 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp @@ -76,9 +76,8 @@ bool ConsoleCommandParserSpawner::performParsing (const NetworkId &, const Strin static const Unicode::String header(Unicode::narrowToWide(std::string("Creature Listing - ID: POS: Auth Server: Template Name\n"))); result += header; const CreatureObject::AllCreaturesSet & creatureList = CreatureObject::getAllCreatures(); - CreatureObject::AllCreaturesSet::const_iterator i; int count = 0; - for(i = creatureList.begin(); i != creatureList.end(); ++i) + for(auto i = creatureList.begin(); i != creatureList.end(); ++i) { const CreatureObject * creature = (*i); if(creature) diff --git a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.h b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.h index bb0260f1..83aa7a07 100755 --- a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.h +++ b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.h @@ -65,8 +65,8 @@ public: void moveTo (CellProperty const * cell, Vector const & target_p, float const radius = 0.0f); void moveTo (Unicode::String const & targetName); - void patrol ( stdvector::fwd const & locations, bool random, bool flip, bool repeat, int startPoint); - void patrol ( stdvector::fwd const & locations, bool random, bool flip, bool repeat, int startPoint); + void patrol ( std::vector const & locations, bool random, bool flip, bool repeat, int startPoint); + void patrol ( std::vector const & locations, bool random, bool flip, bool repeat, int startPoint); bool wander ( float minLength, float maxLength, float minAngle, float maxAngle, float minDelay, float maxDelay ); void loiter (CellProperty const * homeCell, Vector const & home_p, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay); void loiter (NetworkId const & target, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay); diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipController.h b/engine/server/library/serverGame/src/shared/controller/AiShipController.h index d3053774..384f4ecb 100755 --- a/engine/server/library/serverGame/src/shared/controller/AiShipController.h +++ b/engine/server/library/serverGame/src/shared/controller/AiShipController.h @@ -45,9 +45,9 @@ public: AO_count }; - typedef stdvector::fwd TransformList; - typedef stdvector::fwd CachedNetworkIdList; - typedef stdvector::fwd NetworkIdList; + typedef std::vector TransformList; + typedef std::vector CachedNetworkIdList; + typedef std::vector NetworkIdList; static void install(); @@ -168,7 +168,7 @@ protected: private: - typedef stdset::fwd CachedNetworkIdSet; + typedef std::set CachedNetworkIdSet; enum CountermeasureState { diff --git a/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp index e0563d26..75ac1fae 100755 --- a/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp @@ -224,7 +224,7 @@ void CreatureController::handleMessage(const int message, const float value, con { const MessageQueueNetworkId * const msg = NON_NULL(dynamic_cast(data)); - typedef stdvector::fwd DataVector; + typedef std::vector DataVector; DataVector dv; HarvesterInstallationObject * const harvester = dynamic_cast(ServerWorld::findObjectByNetworkId(msg->getNetworkId())); diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h index fdf02467..a0edfa95 100755 --- a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h +++ b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h @@ -80,7 +80,7 @@ private: private: - typedef stdmap::fwd GunnerWeaponIndexList; + typedef std::map GunnerWeaponIndexList; uint32 m_clientToServerLastSyncStamp; std::set m_teleportIds; diff --git a/engine/server/library/serverGame/src/shared/controller/ShipController.h b/engine/server/library/serverGame/src/shared/controller/ShipController.h index 6fd1dccf..22a6330a 100755 --- a/engine/server/library/serverGame/src/shared/controller/ShipController.h +++ b/engine/server/library/serverGame/src/shared/controller/ShipController.h @@ -30,8 +30,8 @@ class ShipController : public TangibleController { public: - typedef stdset::fwd CachedNetworkIdList; - typedef stdmultiset::fwd DockedByList; + typedef std::set CachedNetworkIdList; + typedef std::multiset DockedByList; explicit ShipController(ShipObject * newOwner); virtual ~ShipController(); diff --git a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.h b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.h index f2dbdfbb..fe75057b 100755 --- a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.h +++ b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.h @@ -54,7 +54,7 @@ private: }; typedef std::set Names; - typedef stdmap::fwd CrcNameMap; + typedef std::map CrcNameMap; Names * m_names; CrcNameMap * m_crcMap; diff --git a/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp b/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp index 6996f5fc..8d7db5fa 100755 --- a/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp @@ -22,7 +22,7 @@ // ====================================================================== bool BiographyManager::m_installed = false; -stdmap::fwd >::fwd *BiographyManager::m_retrievalQueue; +std::map > *BiographyManager::m_retrievalQueue; BiographyManager::BiographyManager() diff --git a/engine/server/library/serverGame/src/shared/core/BiographyManager.h b/engine/server/library/serverGame/src/shared/core/BiographyManager.h index 826d7751..b441ccfa 100755 --- a/engine/server/library/serverGame/src/shared/core/BiographyManager.h +++ b/engine/server/library/serverGame/src/shared/core/BiographyManager.h @@ -43,7 +43,7 @@ private: /** * Map of (object bio) -> (set of objects that want the bio when it's loaded) */ - static stdmap::fwd >::fwd *m_retrievalQueue; + static std::map > *m_retrievalQueue; }; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/Client.h b/engine/server/library/serverGame/src/shared/core/Client.h index 9ed69e72..bbfce949 100755 --- a/engine/server/library/serverGame/src/shared/core/Client.h +++ b/engine/server/library/serverGame/src/shared/core/Client.h @@ -40,7 +40,7 @@ class Client : public MessageDispatch::Receiver, public MessageDispatch::Emitter public: typedef std::map AccountFeatureIdList; - Client (ConnectionServerConnection & connection, const NetworkId & characterObjectId, const std::string& accountName, const std::string& ipAddr, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, stdset::fwd const & observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, AccountFeatureIdList const & accountFeatureIds, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints, std::vector > const & consumedRewardEvents, std::vector > const & claimedRewardItems, bool usingAdminLogin, CombatDataTable::CombatSpamFilterType combatSpamFilter, int combatSpamRangeSquaredFilter, int furnitureRotationDegree, bool hasUnoccupiedJediSlot, bool isJediSlotCharacter, bool sendToStarport = false); + Client (ConnectionServerConnection & connection, const NetworkId & characterObjectId, const std::string& accountName, const std::string& ipAddr, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, std::set const & observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, AccountFeatureIdList const & accountFeatureIds, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints, std::vector > const & consumedRewardEvents, std::vector > const & claimedRewardItems, bool usingAdminLogin, CombatDataTable::CombatSpamFilterType combatSpamFilter, int combatSpamRangeSquaredFilter, int furnitureRotationDegree, bool hasUnoccupiedJediSlot, bool isJediSlotCharacter, bool sendToStarport = false); virtual ~Client (); static void install(); @@ -215,7 +215,7 @@ private: unsigned int m_entitlementEntitledTimeSinceLastLogin; int m_buddyPoints; std::set m_previousObservedObjects; - stdvector >::fwd m_syncUIs; + std::vector > m_syncUIs; std::vector > m_consumedRewardEvents; std::vector > m_claimedRewardItems; bool m_usingAdminLogin; diff --git a/engine/server/library/serverGame/src/shared/core/CombatTracker.h b/engine/server/library/serverGame/src/shared/core/CombatTracker.h index d7907921..c8e83953 100755 --- a/engine/server/library/serverGame/src/shared/core/CombatTracker.h +++ b/engine/server/library/serverGame/src/shared/core/CombatTracker.h @@ -27,7 +27,7 @@ public: static void removeDefender(TangibleObject *defender); private: - static void getInterestedViewers(TangibleObject const *defender, stdvector::fwd &combatViewers); + static void getInterestedViewers(TangibleObject const *defender, std::vector &combatViewers); }; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h index fcd29f59..ca513ac7 100755 --- a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h +++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h @@ -580,7 +580,7 @@ class ConfigServerGame static Data *data; static Vector startingPosition; - static stdmap::fwd m_components; + static std::map m_components; public: diff --git a/engine/server/library/serverGame/src/shared/core/ConsentManager.h b/engine/server/library/serverGame/src/shared/core/ConsentManager.h index 902ff46d..a8539e38 100755 --- a/engine/server/library/serverGame/src/shared/core/ConsentManager.h +++ b/engine/server/library/serverGame/src/shared/core/ConsentManager.h @@ -37,7 +37,7 @@ private: ConsentManager &operator =(ConsentManager const &); private: - stdmap >::fwd >::fwd m_consentMap; + std::map > > m_consentMap; int m_nextId; }; diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.h b/engine/server/library/serverGame/src/shared/core/GameServer.h index 2723090a..594f9879 100755 --- a/engine/server/library/serverGame/src/shared/core/GameServer.h +++ b/engine/server/library/serverGame/src/shared/core/GameServer.h @@ -62,8 +62,8 @@ class GameServer : public MessageDispatch::Receiver { public: - typedef stdunordered_map::fwd ClientMap; - typedef stdvector::fwd ConnectionServerVector; + typedef std::unordered_map ClientMap; + typedef std::vector ConnectionServerVector; virtual ~GameServer (); @@ -117,10 +117,10 @@ public: void loadTerrain (); - stdvector::fwd const &getAllGameServerPids() const; + std::vector const &getAllGameServerPids() const; bool hasConnectionsToOtherGameServers() const; - void getObjectsWithClients(stdvector::fwd &objects) const; + void getObjectsWithClients(std::vector &objects) const; static uint64 getTotalObjectCreatesReceived(); static uint64 getTotalObjectCreatesSent(); @@ -185,8 +185,8 @@ private: //----------------------------------------------------------------------- // maps - typedef stdmap::fwd >::fwd PendingContainedObjectsMap; - typedef stdmap::fwd CharactersPendingCreationMap; + typedef std::map > PendingContainedObjectsMap; + typedef std::map CharactersPendingCreationMap; bool m_done; uint32 m_processId; diff --git a/engine/server/library/serverGame/src/shared/core/InstantDeleteList.h b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.h index e282479c..03d0bb96 100755 --- a/engine/server/library/serverGame/src/shared/core/InstantDeleteList.h +++ b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.h @@ -26,7 +26,7 @@ class InstantDeleteList static bool isOnList(const ObjectTemplate &theTemplate); private: - typedef stdset::fwd ListType; + typedef std::set ListType; static ListType *ms_theList; }; diff --git a/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp b/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp index aa3c0f2c..11e41997 100755 --- a/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp +++ b/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp @@ -342,7 +342,7 @@ void MessageToQueue::sendRecurringMessageToC (const NetworkId &objectId, const // ---------------------------------------------------------------------- -void MessageToQueue::sendRecurringMessageToJava(const NetworkId &objectId, const std::string &method, const stdvector::fwd &packedData, int delay) +void MessageToQueue::sendRecurringMessageToJava(const NetworkId &objectId, const std::string &method, const std::vector &packedData, int delay) { WARNING_DEBUG_FATAL(delay < 0, ("Sent messageTo with negative delay. Target %s, method %s, delay %f",objectId.getValueString().c_str(), method.c_str(), delay)); if (delay < 0) diff --git a/engine/server/library/serverGame/src/shared/core/MessageToQueue.h b/engine/server/library/serverGame/src/shared/core/MessageToQueue.h index 0dd8348a..1d76d575 100755 --- a/engine/server/library/serverGame/src/shared/core/MessageToQueue.h +++ b/engine/server/library/serverGame/src/shared/core/MessageToQueue.h @@ -30,9 +30,9 @@ public: static unsigned long getEffectiveMessageToTime(); static void sendMessageToC (const NetworkId &objectId, const std::string &method, const std::string &data, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString); - static void sendMessageToJava (const NetworkId &objectId, const std::string &method, const stdvector::fwd &packedData, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString); + static void sendMessageToJava (const NetworkId &objectId, const std::string &method, const std::vector &packedData, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString); static void sendRecurringMessageToC (const NetworkId &objectId, const std::string &method, const std::string & data, int delay); - static void sendRecurringMessageToJava (const NetworkId &objectId, const std::string &method, const stdvector::fwd &packedData, int delay); + static void sendRecurringMessageToJava (const NetworkId &objectId, const std::string &method, const std::vector &packedData, int delay); static void cancelRecurringMessageTo (const NetworkId &objectId, const std::string &method); static void update (float frameTime); static void addToScheduler (ServerObject const & object, unsigned long callTime); diff --git a/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp b/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp index bc67a91b..6f924ea5 100755 --- a/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp @@ -27,7 +27,7 @@ namespace MoveSimManagerNamespace { - typedef stdvector::fwd NetworkIdVector; + typedef std::vector NetworkIdVector; NetworkIdVector s_moveSimCreatures; const char * const templateName_npc = "object/mobile/kaadu_hue.iff"; diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp index 65453d39..3724892f 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id) // ---------------------------------------------------------------------- -void NameManager::addPlayers(const stdvector::fwd &ids, const stdvector::fwd &stationIds, const stdvector::fwd &names, const stdvector::fwd &fullNames, const stdvector::fwd &createTimes, const stdvector::fwd &lastLoginTimes) +void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) { DEBUG_FATAL(ids.size() != stationIds.size(),("Programmer bug: Vectors ids and stationIds must be the same size.\n")); DEBUG_FATAL(ids.size() != names.size(),("Programmer bug: Vectors ids and names must be the same size.\n")); diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.h b/engine/server/library/serverGame/src/shared/core/NameManager.h index 27d2204b..6d440b16 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.h +++ b/engine/server/library/serverGame/src/shared/core/NameManager.h @@ -33,7 +33,7 @@ class NameManager public: int getTotalPlayerCount () const; void addPlayer (const NetworkId &id, uint32 stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers); - void addPlayers (const stdvector::fwd &ids, const stdvector::fwd &stationIds, const stdvector::fwd &names, const stdvector::fwd &fullNames, const stdvector::fwd &createTimes, const stdvector::fwd &lastLoginTimes); + void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); void renamePlayer (const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName); std::string debugGetNameList () const; bool isPlayer (NetworkId const & possiblePlayer) const; @@ -43,14 +43,14 @@ class NameManager const std::string & getPlayerFullName (const NetworkId &id) const; int getPlayerCreateTime (const NetworkId &id) const; int getPlayerLastLoginTime (const NetworkId &id) const; - void getPlayerWithLastLoginTimeAfter (time_t time, stdmultimap, std::string> >::fwd &result) const; - void getPlayerWithLastLoginTimeBefore (time_t time, stdmultimap, std::string> >::fwd &result) const; - void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap, std::string> >::fwd &result) const; - void getPlayerWithLastLoginTimeAfterDistribution (stdmap >::fwd &result) const; - void getPlayerWithCreateTimeAfter (time_t time, stdmultimap, std::string> >::fwd &result) const; - void getPlayerWithCreateTimeBefore (time_t time, stdmultimap, std::string> >::fwd &result) const; - void getPlayerWithCreateTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap, std::string> >::fwd &result) const; - void getPlayerWithCreateTimeAfterDistribution (stdmap >::fwd &result) const; + void getPlayerWithLastLoginTimeAfter (time_t time, std::multimap, std::string> > &result) const; + void getPlayerWithLastLoginTimeBefore (time_t time, std::multimap, std::string> > &result) const; + void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap, std::string> > &result) const; + void getPlayerWithLastLoginTimeAfterDistribution (std::map > &result) const; + void getPlayerWithCreateTimeAfter (time_t time, std::multimap, std::string> > &result) const; + void getPlayerWithCreateTimeBefore (time_t time, std::multimap, std::string> > &result) const; + void getPlayerWithCreateTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap, std::string> > &result) const; + void getPlayerWithCreateTimeAfterDistribution (std::map > &result) const; void releasePlayerName (const NetworkId &id); Unicode::String generateRandomName (const std::string &directory, const std::string &nameTable) const; Unicode::String generateUniqueRandomName (const std::string &directory, const std::string &nameTable) const; @@ -85,9 +85,9 @@ class NameManager time_t lastLoginTime; }; - typedef stdmap::fwd NameGeneratorMapType; - typedef stdmap::fwd IdToCharacterDataMapType; - typedef stdmap::fwd NameToIdMapType; + typedef std::map NameGeneratorMapType; + typedef std::map IdToCharacterDataMapType; + typedef std::map NameToIdMapType; private: mutable NameGeneratorMapType * m_nameGenerators; diff --git a/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h b/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h index 91fd23d5..c5a8fd29 100755 --- a/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h +++ b/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h @@ -55,7 +55,7 @@ class NonCriticalTaskQueue : public Singleton2 ~NonCriticalTaskQueue (); private: - typedef stdlist::fwd TaskListType; + typedef std::list TaskListType; TaskListType *m_tasks; }; diff --git a/engine/server/library/serverGame/src/shared/core/NpcConversation.h b/engine/server/library/serverGame/src/shared/core/NpcConversation.h index 72d8d185..451f33ec 100755 --- a/engine/server/library/serverGame/src/shared/core/NpcConversation.h +++ b/engine/server/library/serverGame/src/shared/core/NpcConversation.h @@ -66,7 +66,7 @@ private: CachedNetworkId m_player; CachedNetworkId m_npc; - typedef stdvector::fwd ResponseVector; + typedef std::vector ResponseVector; ResponseVector * m_responses; uint32 m_appearanceOverrideSharedTemplateCrc; diff --git a/engine/server/library/serverGame/src/shared/core/ObserveTracker.h b/engine/server/library/serverGame/src/shared/core/ObserveTracker.h index 590a2981..b0f47396 100755 --- a/engine/server/library/serverGame/src/shared/core/ObserveTracker.h +++ b/engine/server/library/serverGame/src/shared/core/ObserveTracker.h @@ -26,13 +26,13 @@ public: static void update(); static bool isObserving(Client const &client, ServerObject const &obj); - static void onObjectControlled(Client &client, ServerObject &obj, stdset::fwd const &oldObserveList); - static void onClientControlComplete(Client &client, stdset::fwd const &oldObserveList); - static void onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, stdset::fwd const *oldObserveList = 0); + static void onObjectControlled(Client &client, ServerObject &obj, std::set const &oldObserveList); + static void onClientControlComplete(Client &client, std::set const &oldObserveList); + static void onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set const *oldObserveList = 0); static void onClientExitedNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume); static void onClientAddedVisibleObjectSpace(Client &client, ServerObject &visibleObject); static void onClientLostVisibleObjectSpace(Client &client, ServerObject &visibleObject); - static void onClientEnteredPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume, stdset::fwd const *oldObserveList = 0); + static void onClientEnteredPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set const *oldObserveList = 0); static void onClientExitedPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume); static bool onClientOpenedContainer(Client &client, ServerObject &obj, int sequence, std::string const &slotDesc, bool sendOpenContainerNotification = true); static bool onClientClosedContainer(Client &client, ServerObject &obj); @@ -49,7 +49,7 @@ public: static void onCraftingPrototypeCreated(ServerObject const &objOwner, ServerObject &objPrototype); static void onCraftingEndCraftingSession(ServerObject const &objOwner, ServerObject &objPrototype); static void onMissionCriticalObjectAdded(ServerObject const &playerObject, ServerObject &criticalShip); - static void onMakeVendorInventory(ServerObject &vendorInventory, stdset::fwd const & oldInventoryObservers); + static void onMakeVendorInventory(ServerObject &vendorInventory, std::set const & oldInventoryObservers); static void onClientAboutToOpenPublicContainer(Client & client, ServerObject & container); }; diff --git a/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h b/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h index f9d963a6..abd6d667 100755 --- a/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h +++ b/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h @@ -21,11 +21,11 @@ class PlanetMapManagerServer { public: - typedef stdvector::fwd MapLocationVector; - typedef stdvector::fwd IntVector; + typedef std::vector MapLocationVector; + typedef std::vector IntVector; static void handleClientRequest (const Client & client, const GetMapLocationsMessage & msg); - static void handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const stdset >::fwd & msg); + static void handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const std::set > & msg); static bool addMapLocation (const MapLocation & loc, int mapLocationType, bool enforceLocationCountLimits); static bool removeMapLocation (const NetworkId & id); diff --git a/engine/server/library/serverGame/src/shared/core/ProxyList.h b/engine/server/library/serverGame/src/shared/core/ProxyList.h index 6a6a0aad..8eae21ee 100755 --- a/engine/server/library/serverGame/src/shared/core/ProxyList.h +++ b/engine/server/library/serverGame/src/shared/core/ProxyList.h @@ -1,7 +1,7 @@ #ifndef _ProxyList_H_ #define _ProxyList_H_ -typedef stdset::fwd ProxyList; +typedef std::set ProxyList; #endif // _ProxyList_H_ diff --git a/engine/server/library/serverGame/src/shared/core/PurgeManager.h b/engine/server/library/serverGame/src/shared/core/PurgeManager.h index e843ccd0..c85f708d 100755 --- a/engine/server/library/serverGame/src/shared/core/PurgeManager.h +++ b/engine/server/library/serverGame/src/shared/core/PurgeManager.h @@ -23,7 +23,7 @@ class PurgeManager { public: - static void handleStructuresAndVendorsForPurge(StationId stationId, stdvector >::fwd const & structures, stdvector > >::fwd const & vendors, bool warnOnly); + static void handleStructuresAndVendorsForPurge(StationId stationId, std::vector > const & structures, std::vector > > const & vendors, bool warnOnly); }; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/RegexList.h b/engine/server/library/serverGame/src/shared/core/RegexList.h index a1c3c705..12f1a696 100755 --- a/engine/server/library/serverGame/src/shared/core/RegexList.h +++ b/engine/server/library/serverGame/src/shared/core/RegexList.h @@ -39,7 +39,7 @@ public: private: class Entry; - typedef stdvector::fwd EntryVector; + typedef std::vector EntryVector; private: diff --git a/engine/server/library/serverGame/src/shared/core/ServerUIManager.h b/engine/server/library/serverGame/src/shared/core/ServerUIManager.h index 1829cec5..2402de07 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerUIManager.h +++ b/engine/server/library/serverGame/src/shared/core/ServerUIManager.h @@ -42,8 +42,8 @@ private: static int getNewPageId(); private: - static stdmap::fwd m_pages; - static stdmultimap::fwd m_primaryControlledObjectMap; + static std::map m_pages; + static std::multimap m_primaryControlledObjectMap; static int m_pageCounter; }; diff --git a/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp b/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp index 29f8e60e..8878ba49 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp @@ -527,7 +527,7 @@ std::string ServerUniverse::generateRandomResourceName(const std::string &nameTa // ---------------------------------------------------------------------- -void ServerUniverse::resourceClassTreeLoaded(stdmap::fwd &resourceClasses) +void ServerUniverse::resourceClassTreeLoaded(std::map &resourceClasses) { ServerResourceClassObject::loadDistributionFromIff(resourceClasses); } @@ -660,7 +660,7 @@ ResourceTypeObject const * ServerUniverse::pickRandomNonDepletedResource(const s // ---------------------------------------------------------------------- -void ServerUniverse::createGroup(GroupMemberParam const & leader, stdvector::fwd const & members) +void ServerUniverse::createGroup(GroupMemberParam const & leader, std::vector const & members) { if (m_authoritative) GroupObject::createGroup(leader, members); diff --git a/engine/server/library/serverGame/src/shared/core/ServerUniverse.h b/engine/server/library/serverGame/src/shared/core/ServerUniverse.h index 65206e27..667a63a0 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerUniverse.h +++ b/engine/server/library/serverGame/src/shared/core/ServerUniverse.h @@ -65,12 +65,12 @@ public: void registerPlanetObject (PlanetObject &newPlanet); void registerResourceTypeObject (ResourceTypeObject &newType, bool newlySpawned); void sendUpdatedTypeToAllServers (ResourceTypeObject &changedType); - virtual void resourceClassTreeLoaded (stdmap::fwd &resourceClasses); + virtual void resourceClassTreeLoaded (std::map &resourceClasses); std::string generateRandomResourceName (const std::string &nameTable) const; ResourceTypeObject const * pickRandomNonDepletedResource (const std::string &parentResourceClassName) const; // int extractResourceFromRandomPool (const std::string &parentResourceClassName, int amount, const Vector &pos); virtual ResourceClassObject* makeResourceClassObject(); - void createGroup (GroupMemberParam const & leader, stdvector::fwd const & members); + void createGroup (GroupMemberParam const & leader, std::vector const & members); void onServerConnectionClosed (uint32 processId); void updatePopulationList (const PopulationList &newData); int getPopulationAtLocation (const std::string &scene, int x, int z) const; @@ -91,7 +91,7 @@ public: int getGcwGroupImperialScorePercentile(std::string const & gcwGroup) const; // the rebel score is 100 - the imperial score static void setConnectedCharacterLfgData(const NetworkId & characterId, const LfgCharacterData & lfgCharacterData); - static stdmap::fwd const & getConnectedCharacterLfgData(); + static std::map const & getConnectedCharacterLfgData(); static void setConnectedCharacterGroupData(const NetworkId & characterId, const NetworkId & groupId); @@ -115,7 +115,7 @@ public: static void setConnectedCharacterBiographyData(const NetworkId & characterId, const Unicode::String & biography); static void removeConnectedCharacterBiographyData(const NetworkId & characterId); - static stdmap::fwd const & getConnectedCharacterBiographyData(); + static std::map const & getConnectedCharacterBiographyData(); static void removeConnectedCharacterData(const NetworkId & characterId); @@ -136,7 +136,7 @@ private: private: //TODO: consistency about whether STL containers are pointers or not - typedef stdvector::fwd UniverseObjectList; + typedef std::vector UniverseObjectList; UniverseObjectList * m_universeObjectList; UniverseObjectList * m_pendingUniverseObjects; bool m_loaded; @@ -148,7 +148,7 @@ private: // // Planet Objects // - typedef stdmap::fwd PlanetNameMap; + typedef std::map PlanetNameMap; PlanetObject *m_thisPlanet; PlanetObject *m_tatooinePlanet; @@ -157,9 +157,9 @@ private: // // Resource Type Objects // - typedef stdmap::fwd ResourceTypeNameMap; - typedef stdmap::fwd ResourceTypeIdMap; - typedef stdvector::fwd ResourcesToSendType; + typedef std::map ResourceTypeNameMap; + typedef std::map ResourceTypeIdMap; + typedef std::vector ResourcesToSendType; ResourceTypeNameMap *m_resourceTypeNameMap; ResourceTypeIdMap *m_resourceTypeIdMap; @@ -173,8 +173,8 @@ private: // bool m_loaded; // Theater data - typedef stdmap::fwd TheaterNameIdMap; - typedef stdmap::fwd TheaterIdNameMap; + typedef std::map TheaterNameIdMap; + typedef std::map TheaterIdNameMap; TheaterNameIdMap * m_theaterNameIdMap; TheaterIdNameMap * m_theaterIdNameMap; diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorld.h b/engine/server/library/serverGame/src/shared/core/ServerWorld.h index e0861d7e..b8297755 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerWorld.h +++ b/engine/server/library/serverGame/src/shared/core/ServerWorld.h @@ -64,28 +64,28 @@ public: static ServerObject * findObjectByNetworkId (const NetworkId& id, bool searchQueuedList=false); static ServerObject * findUninitializedObjectByNetworkId(const NetworkId& id); - static void findObjectsInRange (const Vector & location, const float distance, stdvector::fwd & results); - static void findStaticCollidableObjectsInRange (const Vector & location, const float distance, stdvector::fwd & results); - static void findCreaturesInRange (const Vector & location, const float distance, stdvector::fwd & results); - static void findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, stdvector::fwd & results); - static void findCreaturesOfNicheInRange (const Vector & location, const float distance, int niche, int mask, stdvector::fwd & results); - static void findCreaturesOfSpeciesInRange (const Vector & location, const float distance, int species, stdvector::fwd & results); - static void findCreaturesOfRaceInRange (const Vector & location, const float distance, int species, int race, stdvector::fwd & results); - static void findNonCreaturesInRange (const Vector & location, const float distance, stdvector::fwd & results); - static void findNPCsInRange (const Vector & location, const float distance, stdvector::fwd & results); - static void findPlayerCreaturesInRange (const Vector & location, const float distance, stdvector::fwd & results); + static void findObjectsInRange (const Vector & location, const float distance, std::vector & results); + static void findStaticCollidableObjectsInRange (const Vector & location, const float distance, std::vector & results); + static void findCreaturesInRange (const Vector & location, const float distance, std::vector & results); + static void findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, std::vector & results); + static void findCreaturesOfNicheInRange (const Vector & location, const float distance, int niche, int mask, std::vector & results); + static void findCreaturesOfSpeciesInRange (const Vector & location, const float distance, int species, std::vector & results); + static void findCreaturesOfRaceInRange (const Vector & location, const float distance, int species, int race, std::vector & results); + static void findNonCreaturesInRange (const Vector & location, const float distance, std::vector & results); + static void findNPCsInRange (const Vector & location, const float distance, std::vector & results); + static void findPlayerCreaturesInRange (const Vector & location, const float distance, std::vector & results); - static void findObjectsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector::fwd & results); - static void findObjectsInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector::fwd & results); - static void findCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector::fwd & results); - static void findCreaturesInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector::fwd & results); - static void findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector::fwd & results); - static void findCreaturesOfNicheInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int niche, int mask, stdvector::fwd & results); - static void findCreaturesOfSpeciesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, stdvector::fwd & results); - static void findCreaturesOfRaceInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, int race, stdvector::fwd & results); - static void findNonCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector::fwd & results); - static void findNPCsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector::fwd & results); - static void findPlayerCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector::fwd & results); + static void findObjectsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector & results); + static void findObjectsInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, std::vector & results); + static void findCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector & results); + static void findCreaturesInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, std::vector & results); + static void findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector & results); + static void findCreaturesOfNicheInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int niche, int mask, std::vector & results); + static void findCreaturesOfSpeciesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, std::vector & results); + static void findCreaturesOfRaceInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, int race, std::vector & results); + static void findNonCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector & results); + static void findNPCsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector & results); + static void findPlayerCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector & results); static ServerObject * findClosestNPC (const Vector & location, float distance); static ServerObject * findClosestPlayer (const Vector & location, float distance); @@ -129,8 +129,8 @@ public: static bool isSpaceBattlefieldZoneWithPvp (); static void removeObjectTriggerVolume (TriggerVolume * triggerVolume); - static void dumpObjectSphereTree (stdvector >::fwd & results); - static void dumpTriggerSphereTree (stdvector >::fwd & results); + static void dumpObjectSphereTree (std::vector > & results); + static void dumpTriggerSphereTree (std::vector > & results); static const WeatherData & getWeather (); @@ -145,9 +145,9 @@ public: static void onPreloadComplete (); static bool isPreloadComplete (); - static void getSpatialChatListeners(ServerObject &source, float distance, stdvector::fwd &results); + static void getSpatialChatListeners(ServerObject &source, float distance, std::vector &results); - static int getNumMoveLists(stdvector::fwd & moveListSize); + static int getNumMoveLists(std::vector & moveListSize); static void setNumMoveLists(int numMoveLists); protected: @@ -166,7 +166,7 @@ private: static ServerObject* createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, bool persisted, bool); ///< Called by CreateNewObject(*) functions. This is provided to share code. static ServerObject* createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, const SlotId & slotId, bool persisted); - static ServerObject *findClosestObjectInList(const Vector &location, const stdvector::fwd &candidates); + static ServerObject *findClosestObjectInList(const Vector &location, const std::vector &candidates); static void addTangibleObject(ServerObject * object); static void removeTangibleObject(ServerObject * object); diff --git a/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h index c940304a..890c236f 100755 --- a/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h +++ b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h @@ -18,7 +18,7 @@ class NetworkId; class StaticLootItemManager { public: - typedef stdvector >::fwd AttributeVector; + typedef std::vector > AttributeVector; static void sendDataToClient(NetworkId const & playerId, std::string const & staticItemName); static void getAttributes(NetworkId const & playerId, std::string const & staticItemName, AttributeVector & data); diff --git a/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h index 7395ab06..83d4ab04 100755 --- a/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h +++ b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h @@ -44,10 +44,10 @@ class VeteranRewardManager static bool isEventAccountUnique(std::string const & eventName); static bool isItemAccountUnique(std::string const & itemName); static bool isItemAccountUniqueFeatureId(std::string const & itemName); - static void verifyFeatureIdTransactions(CreatureObject & playerCreature, stdmap::fwd const & transactionsFromLoginServer); + static void verifyFeatureIdTransactions(CreatureObject & playerCreature, std::map const & transactionsFromLoginServer); static void migrateVeteranRewardsClaimInformation(CreatureObject & playerCreature); - static void getConsumedEvents(ServerObject const & playerCreature, stdvector::fwd & consumedEvents); - static void getClaimedItems(ServerObject const & playerCreature, stdvector::fwd & claimedItems); + static void getConsumedEvents(ServerObject const & playerCreature, std::vector & consumedEvents); + static void getClaimedItems(ServerObject const & playerCreature, std::vector & claimedItems); static void tcgRedemption(CreatureObject const & playerCreature, ServerObject & item, int featureId, int adjustment); static bool checkForTcgRedemptionInProgress(ServerObject const & item); static void handleTcgRedemptionResponse(ServerObject & item, AdjustAccountFeatureIdResponse const & response); diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInterface.h b/engine/server/library/serverGame/src/shared/guild/GuildInterface.h index a4517f7b..d8675d70 100755 --- a/engine/server/library/serverGame/src/shared/guild/GuildInterface.h +++ b/engine/server/library/serverGame/src/shared/guild/GuildInterface.h @@ -69,7 +69,7 @@ public: static int getGuildId(NetworkId const &memberId); static int getGuildIdForSponsored(NetworkId const &memberId); static int getGuildIdForGuildLeader(NetworkId const &leaderId); - static void getAllGuildIds(stdvector::fwd &results); + static void getAllGuildIds(std::vector &results); static int findGuild(std::string const &name); static bool guildExists(int guildId); static std::pair const *hasDeclaredWarAgainst(int actorGuildId, int targetGuildId); @@ -96,18 +96,18 @@ public: static std::map, uint32> const & getGcwRegionDefenderGuilds(); static std::map > const & getGcwRegionDefenderGuildsCount(); static int getGcwRegionDefenderGuildsVersion(); - static void getGuildMemberIds(int guildId, stdvector::fwd &results); - static void getGuildMemberIdsWithPermissions(int guildId, int permissions, stdvector::fwd &results); + static void getGuildMemberIds(int guildId, std::vector &results); + static void getGuildMemberIdsWithPermissions(int guildId, int permissions, std::vector &results); static int getGuildCountMembersOnly(int guildId); static int getGuildCountSponsoredOnly(int guildId); static int getGuildCountMembersAndSponsored(int guildId); static int getGuildCountMembersGuildWarPvPEnabled(int guildId); static GuildMemberInfo const *getGuildMemberInfo(int guildId, NetworkId const &memberId); static bool getGuildMemberGuildWarEnabled(int guildId, NetworkId const &memberId); - static stdvector::fwd const &getGuildEnemies(int guildId); - static stdmap >::fwd const &getGuildEnemiesKillInfo(int guildId); + static std::vector const &getGuildEnemies(int guildId); + static std::map > const &getGuildEnemiesKillInfo(int guildId); static std::pair const &getGuildEnemyKillInfo(int guildIdA, int guildIdB); - static stdvector::fwd const &getGuildsAtWarWith(int guildId); + static std::vector const &getGuildsAtWarWith(int guildId); static ScriptParams const *getMasterGuildWarTableDictionary(); static void updateInactiveGuildWarTrackingInfo(GuildObject &masterGuildObject, int guildAId, int guildAKillCount, int guildBId, int guildBKillCount); static ScriptParams const *getInactiveGuildWarTableDictionary(); @@ -131,7 +131,7 @@ public: static void addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName); static void removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName); static bool hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName); - static void getGuildMemberRank(int guildId, NetworkId const &memberId, stdvector::fwd &ranks); + static void getGuildMemberRank(int guildId, NetworkId const &memberId, std::vector &ranks); static void setGuildEnemy(int guildId, int enemyId); static void removeGuildEnemy(int guildId, int enemyId); static void updateGuildWarKillTracking(CreatureObject const &killer, CreatureObject const &victim); diff --git a/engine/server/library/serverGame/src/shared/network/Chat.cpp b/engine/server/library/serverGame/src/shared/network/Chat.cpp index fede9920..0e3f4f91 100755 --- a/engine/server/library/serverGame/src/shared/network/Chat.cpp +++ b/engine/server/library/serverGame/src/shared/network/Chat.cpp @@ -567,7 +567,7 @@ void Chat::uninvite(const std::string & to, const std::string & room) //---------------------------------------------------------------------- -void Chat::inviteGroupMembers(const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const stdvector::fwd & members) +void Chat::inviteGroupMembers(const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const std::vector & members) { ChatInviteGroupMembersToRoom inviteMessage(invitor, groupLeader, room, members); sendToChatServer(inviteMessage); diff --git a/engine/server/library/serverGame/src/shared/network/Chat.h b/engine/server/library/serverGame/src/shared/network/Chat.h index f94510f4..7238cce5 100755 --- a/engine/server/library/serverGame/src/shared/network/Chat.h +++ b/engine/server/library/serverGame/src/shared/network/Chat.h @@ -77,7 +77,7 @@ public: static void sendSystemMessage (const std::string & to, const ProsePackage & pp); static void invite (const std::string & to, const std::string & room); static void uninvite (const std::string & to, const std::string & room); - static void inviteGroupMembers (const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const stdvector::fwd & members); + static void inviteGroupMembers (const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const std::vector & members); static unsigned int isAllowedToEnterRoom(const CreatureObject & who, const std::string & room); @@ -99,7 +99,7 @@ private: static Chat * m_instance; ChatAvatarId * m_serverAvatar; ChatServerConnection * m_chatServer; - stdvector::fwd m_deferredChatMessages; + std::vector m_deferredChatMessages; std::string m_gameCode; }; diff --git a/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h b/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h index 5a498e0c..f533c09c 100755 --- a/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h +++ b/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h @@ -20,7 +20,7 @@ class Client; class BaselineDistributionListPool { public: - static stdvector >::fwd *get(ServerObject const &obj, bool allocIfNeeded); + static std::vector > *get(ServerObject const &obj, bool allocIfNeeded); static void free(ServerObject const &obj); }; diff --git a/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp index 9ba696a0..c5837782 100755 --- a/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp @@ -648,7 +648,7 @@ bool BuildingObject::isVisibleOnClient (const Client & /*client*/) const // ---------------------------------------------------------------------- -void BuildingObject::getAttributes(stdvector >::fwd &data) const +void BuildingObject::getAttributes(std::vector > &data) const { TangibleObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/BuildingObject.h b/engine/server/library/serverGame/src/shared/object/BuildingObject.h index ff58fef8..f80295d9 100755 --- a/engine/server/library/serverGame/src/shared/object/BuildingObject.h +++ b/engine/server/library/serverGame/src/shared/object/BuildingObject.h @@ -44,7 +44,7 @@ public: virtual Controller* createDefaultController(void); void addMembersToPackages (); - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; int getMaintenanceCost() const; void setMaintenanceCost(int newConst); @@ -89,7 +89,7 @@ public: }; }; - typedef stdunordered_set::fwd AllBuildingsSet; + typedef std::unordered_set AllBuildingsSet; static const AllBuildingsSet & getAllBuildings(); protected: diff --git a/engine/server/library/serverGame/src/shared/object/CellObject.cpp b/engine/server/library/serverGame/src/shared/object/CellObject.cpp index e0211aa5..72d239c9 100755 --- a/engine/server/library/serverGame/src/shared/object/CellObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CellObject.cpp @@ -581,7 +581,7 @@ bool CellObject::isVisibleOnClient (const Client & /*client*/) const // ---------------------------------------------------------------------- -void CellObject::getAttributes (stdvector >::fwd &data) const +void CellObject::getAttributes (std::vector > &data) const { ServerObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/CellObject.h b/engine/server/library/serverGame/src/shared/object/CellObject.h index 773325f2..8f2ad2fd 100755 --- a/engine/server/library/serverGame/src/shared/object/CellObject.h +++ b/engine/server/library/serverGame/src/shared/object/CellObject.h @@ -69,7 +69,7 @@ public: bool isAllowed(CreatureObject const &who) const; virtual bool isVisibleOnClient (const Client & client) const; void addMembersToPackages(); - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; virtual const NetworkId & getOwnerId() const; virtual bool isOwner(NetworkId const &id, Client const *client) const; diff --git a/engine/server/library/serverGame/src/shared/object/CellPermissions.h b/engine/server/library/serverGame/src/shared/object/CellPermissions.h index d05703a7..339a8105 100755 --- a/engine/server/library/serverGame/src/shared/object/CellPermissions.h +++ b/engine/server/library/serverGame/src/shared/object/CellPermissions.h @@ -92,7 +92,7 @@ namespace CellPermissions std::string m_permissionString; }; - typedef stdset::fwd PermissionList; + typedef std::set PermissionList; //---------------------------------------------------------------------- @@ -109,7 +109,7 @@ namespace CellPermissions void init(BuildingObject *building); void getCellPermissions(ServerObject &obj); - void handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, stdvector::fwd &expel); + void handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, std::vector &expel); private: ProfilerAutoBlock m_profilerBlock; diff --git a/engine/server/library/serverGame/src/shared/object/CityObject.cpp b/engine/server/library/serverGame/src/shared/object/CityObject.cpp index da741dbf..2fa90f09 100755 --- a/engine/server/library/serverGame/src/shared/object/CityObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CityObject.cpp @@ -394,7 +394,7 @@ void CityObject::setupUniverse() // ---------------------------------------------------------------------- -void CityObject::getAttributes(stdvector >::fwd &data) const +void CityObject::getAttributes(std::vector > &data) const { UniverseObject::getAttributes(data); } @@ -1980,7 +1980,7 @@ CitizenInfo const *CityObject::getCitizenInfo(int cityId, NetworkId const &citiz // ---------------------------------------------------------------------- -void CityObject::getCityStructureIds(int cityId, stdvector::fwd &results) const +void CityObject::getCityStructureIds(int cityId, std::vector &results) const { results.clear(); diff --git a/engine/server/library/serverGame/src/shared/object/CityObject.h b/engine/server/library/serverGame/src/shared/object/CityObject.h index 6364df1a..3cf361fc 100755 --- a/engine/server/library/serverGame/src/shared/object/CityObject.h +++ b/engine/server/library/serverGame/src/shared/object/CityObject.h @@ -32,7 +32,7 @@ public: virtual Controller* createDefaultController(); virtual void setupUniverse(); - virtual void getAttributes(stdvector >::fwd &data) const; + virtual void getAttributes(std::vector > &data) const; virtual void unload(); int createCity(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId, int cityId = 0); @@ -57,24 +57,24 @@ public: void addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName); void removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName); bool hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName); - void getCitizenRank(int cityId, NetworkId const &citizenId, stdvector::fwd &ranks); + void getCitizenRank(int cityId, NetworkId const &citizenId, std::vector &ranks); void setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle); void setCityStructure(int cityId, NetworkId const &structureId, int structureType, bool structureValid); bool cityExists(int cityId) const; CityInfo const &getCityInfo(int cityId) const; - void getAllCityIds(stdvector::fwd &results) const; - stdmap::fwd const &getAllCityInfo() const; + void getAllCityIds(std::vector &results) const; + std::map const &getAllCityInfo() const; int findCityByName(std::string const &name) const; int findCityByCityHall(NetworkId const &cityHallId) const; int getCityAtLocation(std::string const &planetName, int x, int z, int radius) const; - void getCitizenIds(int cityId, stdvector::fwd &results) const; - stdmap, CitizenInfo>::fwd const &getAllCitizensInfo() const; + void getCitizenIds(int cityId, std::vector &results) const; + std::map, CitizenInfo> const &getAllCitizensInfo() const; CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId) const; - void getCityStructureIds(int cityId, stdvector::fwd &results) const; - stdmap, CityStructureInfo>::fwd const & getAllCityStructuresInfo() const; + void getCityStructureIds(int cityId, std::vector &results) const; + std::map, CityStructureInfo> const & getAllCityStructuresInfo() const; CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId) const; - stdvector::fwd const & getCitizenOfCityId(NetworkId const &citizenId) const; + std::vector const & getCitizenOfCityId(NetworkId const &citizenId) const; std::map, uint32> const & getGcwRegionDefenderCities() const; std::map > const & getGcwRegionDefenderCitiesCount() const; diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index ce7819b6..4b5a01ec 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -422,7 +422,7 @@ namespace CreatureObjectNamespace const NetworkId & targetId = target.getNetworkId (); - typedef stdvector::fwd NetworkIdVector; + typedef std::vector NetworkIdVector; static NetworkIdVector ids; ids.clear (); @@ -444,7 +444,7 @@ namespace CreatureObjectNamespace static const std::string objvarname_vendorList = "player_structure.vendor.vendorList"; const Unicode::String & requestorFirstName = object.getAssignedObjectFirstName (); - typedef stdvector::fwd StringVector; + typedef std::vector StringVector; static StringVector sv; sv.clear (); @@ -8909,7 +8909,7 @@ void CreatureObject::updateMissionRequestQueue() // ---------------------------------------------------------------------- -void CreatureObject::getAttributes(stdvector >::fwd &data) const +void CreatureObject::getAttributes(std::vector > &data) const { TangibleObject::getAttributes(data); } @@ -13910,7 +13910,7 @@ bool CreatureObject::stillHasBuffState(uint32 buffNameCrc, int state) const // ---------------------------------------------------------------------- -void CreatureObject::getAllBuffs(stdvector::fwd & buffCrcs) const +void CreatureObject::getAllBuffs(std::vector & buffCrcs) const { buffCrcs.clear(); buffCrcs.reserve(m_buffs.size()); diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.h b/engine/server/library/serverGame/src/shared/object/CreatureObject.h index a1fab43b..c1161c70 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.h +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.h @@ -166,9 +166,9 @@ public: static char const * getMentalStateString(MentalStates::Enumerator const mentalState); static char const * getBehaviorString(Behaviors::Enumerator const behavior); - typedef stdmap::fwd ExperiencePointMap; - typedef stdset::fwd SkillList; - typedef stdvector::fwd StringVector; + typedef std::map ExperiencePointMap; + typedef std::set SkillList; + typedef std::vector StringVector; typedef std::pair, NetworkId /*ship*/> PlayerAndShipPair; CreatureObject(const ServerCreatureObjectTemplate* newTemplate); @@ -229,7 +229,7 @@ public: int getShockWounds () const; void setShockWounds (int wound); void setAttribute (Attributes::Enumerator attribute, Attributes::Value value); - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; void sendTimedModData (uint32 id, float time, bool updateCache = true); void sendCancelTimedMod (uint32 id); @@ -277,13 +277,13 @@ public: virtual const std::set * getTriggerVolumeEntered () const; // crafting functions - const stdmap,int>::fwd & getDraftSchematics () const; + const std::map,int> & getDraftSchematics () const; bool isIngredientInInventory(const Object & ingredient) const; void disableSchematicFiltering(void); void enableSchematicFiltering(void); bool isSchematicFilteringEnabled(void); - void getManufactureSchematics(stdvector::fwd & schematics); - void getManufactureSchematics(stdvector::fwd & schematics, uint32 craftingTypes); + void getManufactureSchematics(std::vector & schematics); + void getManufactureSchematics(std::vector & schematics, uint32 craftingTypes); // inventory functions bool isItemEquipped (const Object & item) const; @@ -292,7 +292,7 @@ public: int getExperiencePoints(const std::string & experienceType) const; const std::map & getExperiencePoints() const; const SkillList & getSkillList() const; - const stdmap >::fwd & getModMap() const; + const std::map > & getModMap() const; const int getModValue(const std::string & modName) const; const int getEnhancedModValue(const std::string & modName) const; const int getEnhancedModValueUncapped(const std::string & modName) const; // This version does not respect getMaxCreatureSkillModBonus @@ -337,7 +337,7 @@ public: void removeAllAttributeModifiers (); void removeAllAttributeAndSkillmodMods (); const AttribMod::AttribMod * getAttributeModifier(const std::string & modName) const; - const stdmap::fwd & getAttributeModifiers () const; + const std::map & getAttributeModifiers () const; // Mental state functions MentalStates::Value getMentalState(MentalStates::Enumerator attribute) const; @@ -345,7 +345,7 @@ public: MentalStates::Value getUnmodifiedMentalState(MentalStates::Enumerator attribute) const; MentalStates::Value getMaxMentalState(MentalStates::Enumerator attribute) const; float getMentalStateDecay(MentalStates::Enumerator state) const; - void getBehaviorTargets(Behaviors::Enumerator behavior, stdvector::fwd &targets); + void getBehaviorTargets(Behaviors::Enumerator behavior, std::vector &targets); Behaviors::Enumerator getBehavior() const; Behaviors::Enumerator getBehaviorToward(const NetworkId &target) const; @@ -489,8 +489,8 @@ public: bool detachAllRiders(); CreatureObject const *getPrimaryMountingRider() const; CreatureObject *getPrimaryMountingRider(); - void getMountingRiders(stdvector::fwd & riders) const; - void getMountingRiders(stdvector::fwd & riders); + void getMountingRiders(std::vector & riders) const; + void getMountingRiders(std::vector & riders); // Called on rider. bool mountCreature(CreatureObject &mountObject); @@ -507,7 +507,7 @@ public: bool pilotShip(ServerObject &pilotSlotObject); bool unpilotShip(); - void getAllShipsInDatapad(stdvector::fwd & ships) const; + void getAllShipsInDatapad(std::vector & ships) const; // ====== @@ -519,7 +519,7 @@ public: }; }; - typedef stdunordered_set::fwd AllCreaturesSet; + typedef std::unordered_set AllCreaturesSet; static const AllCreaturesSet & getAllCreatures(); bool monitorCreatureMovement(const CachedNetworkId &ofTarget, float i_skittishness, float i_curve); @@ -613,7 +613,7 @@ public: void addBuff(uint32 buffNameCrc, float duration = 0.0f, float dynamicValue = 0.0f, NetworkId caster = NetworkId::cms_invalid, uint32 stackCount = 1 ); void addBuff(uint32 buffNameCrc, float timeTillRemoval, float dynamicValue, float totalDuration, NetworkId caster, uint32 stackCount = 1); void removeBuff(uint32 buffNameCrc); - void getAllBuffs(stdvector::fwd & buffCrcs) const; + void getAllBuffs(std::vector & buffCrcs) const; bool getBuff(uint32 buffNameCrc, Buff & buff) const; void decrementBuff(uint32 const buffNameCrc, uint32 const stacksToRemove = 1); void decayBuff(uint32 buffNameCrc, float decayPercentage); @@ -648,7 +648,7 @@ public: unsigned long getLastWaterDamageTime() const; void setLastWaterDamageTime(unsigned long newTime); - stdmap::fwd const & getCommandList() const; + std::map const & getCommandList() const; void clearCommands(); bool grantCommand(std::string const & commandName, bool fromSkill); void revokeCommand(std::string const & command, bool fromSkill, bool ignoreCount = false); @@ -758,7 +758,7 @@ private: void addAttribBonus(int attrib, int bonus); void updateSlopeMovement(const std::string & modName); - int getCurrentTargetsTotal(const stdmap::fwd & targets); + int getCurrentTargetsTotal(const std::map & targets); int changeAttribModCurrentValue(Attributes::Enumerator attrib, int delta, bool checkPoolOverflow); void recomputeAttribModTotals(bool checkPoolOverflow); @@ -799,7 +799,7 @@ private: }; friend struct StateChangeCallback; - typedef stdvector::fwd MessageQueueMissionListResponseDataVector; + typedef std::vector MessageQueueMissionListResponseDataVector; MessageQueueMissionListResponseDataVector m_missionResponseEntries; static const SharedObjectTemplate * m_defaultSharedTemplate; // template to use if no shared template is given diff --git a/engine/server/library/serverGame/src/shared/object/DistributionListStack.h b/engine/server/library/serverGame/src/shared/object/DistributionListStack.h index 1d4546db..6ad2a1eb 100755 --- a/engine/server/library/serverGame/src/shared/object/DistributionListStack.h +++ b/engine/server/library/serverGame/src/shared/object/DistributionListStack.h @@ -22,7 +22,7 @@ class ConnectionServerConnection; class DistributionListStack { public: - static stdmap::fwd>::fwd &alloc(); + static std::map> &alloc(); static void release(); private: diff --git a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp index b0ec57ba..a3e720e5 100755 --- a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp @@ -557,7 +557,7 @@ void DraftSchematicObject::remove() // ---------------------------------------------------------------------- -void DraftSchematicObject::getAttributes(stdvector >::fwd &data) const +void DraftSchematicObject::getAttributes(std::vector > &data) const { IntangibleObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h index 1b81581b..e380e363 100755 --- a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h +++ b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h @@ -60,7 +60,7 @@ public: float getManufactureTime(void) const; float getPrototypeTime(void) const; bool mustDestroyIngredients(void) const; - virtual void getAttributes(stdvector >::fwd &data) const; + virtual void getAttributes(std::vector > &data) const; const StringId getExperimentalAttributeFromAttribute(int index) const; const StringId getExperimentalAttributeFromAttribute(const StringId & attribName) const; diff --git a/engine/server/library/serverGame/src/shared/object/FactoryObject.h b/engine/server/library/serverGame/src/shared/object/FactoryObject.h index 70b87afd..10b022fd 100755 --- a/engine/server/library/serverGame/src/shared/object/FactoryObject.h +++ b/engine/server/library/serverGame/src/shared/object/FactoryObject.h @@ -36,7 +36,7 @@ public: virtual Controller* createDefaultController(void); void addMembersToPackages (); - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; bool startCraftingSession(ManufactureSchematicObject & schematic); bool endCraftingSession(); diff --git a/engine/server/library/serverGame/src/shared/object/GroupObject.cpp b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp index 542742fe..2aad9328 100755 --- a/engine/server/library/serverGame/src/shared/object/GroupObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp @@ -829,7 +829,7 @@ void GroupObject::onVoiceChatRoomCreate(std::string const &name) // static // ---------------------------------------------------------------------- -void GroupObject::getAttributes(stdvector >::fwd &data) const +void GroupObject::getAttributes(std::vector > &data) const { UniverseObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/GroupObject.h b/engine/server/library/serverGame/src/shared/object/GroupObject.h index ec2de442..e9e98519 100755 --- a/engine/server/library/serverGame/src/shared/object/GroupObject.h +++ b/engine/server/library/serverGame/src/shared/object/GroupObject.h @@ -27,7 +27,7 @@ class ServerGroupObjectTemplate; class GroupObject: public UniverseObject { public: - typedef stdvector::fwd GroupMemberParamVector; + typedef std::vector GroupMemberParamVector; GroupObject(ServerGroupObjectTemplate const *newTemplate); virtual ~GroupObject(); @@ -50,12 +50,12 @@ public: static int maximumMembersInGroup(); typedef std::pair GroupMember; - typedef stdvector::fwd GroupMemberVector; + typedef std::vector GroupMemberVector; typedef std::pair GroupShipFormationMember; typedef std::pair GroupPOBShipAndOwner; std::string const & getGroupName () const; - void getGroupMemberIds (stdvector::fwd &members) const; + void getGroupMemberIds (std::vector &members) const; NetworkId const & getGroupLeaderId () const; std::string const & getGroupLeaderName () const; bool isGroupFull () const; diff --git a/engine/server/library/serverGame/src/shared/object/GuildObject.h b/engine/server/library/serverGame/src/shared/object/GuildObject.h index d6c5e298..5eabe714 100755 --- a/engine/server/library/serverGame/src/shared/object/GuildObject.h +++ b/engine/server/library/serverGame/src/shared/object/GuildObject.h @@ -32,22 +32,22 @@ public: virtual Controller* createDefaultController(); virtual void setupUniverse(); virtual bool isVisibleOnClient(const Client &client) const; - virtual void getAttributes(stdvector >::fwd &data) const; + virtual void getAttributes(std::vector > &data) const; virtual void unload(); GuildInfo const * getGuildInfo(int guildId) const; GuildMemberInfo const * getGuildMemberInfo(int guildId, NetworkId const &memberId) const; - stdset::fwd const &getGuildEnemies() const; + std::set const &getGuildEnemies() const; - void getAllGuildIds(stdvector::fwd &results) const; + void getAllGuildIds(std::vector &results) const; int findGuild(std::string const &name) const; bool guildExists(int guildId) const; int getGuildId(NetworkId const &memberId) const; int getGuildIdForSponsored(NetworkId const &memberId) const; int getGuildIdForGuildLeader(NetworkId const &leaderId) const; - void getGuildMemberIds(int guildId, stdvector::fwd &results) const; - void getMemberIdsWithPermissions(int guildId, int permissions, stdvector::fwd &results) const; + void getGuildMemberIds(int guildId, std::vector &results) const; + void getMemberIdsWithPermissions(int guildId, int permissions, std::vector &results) const; int createGuild(std::string const &guildName, std::string const &guildAbbrev, int guildId = 0); void disbandGuild(int guildId); @@ -63,7 +63,7 @@ public: void addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName); void removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName); bool hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName); - void getGuildMemberRank(int guildId, NetworkId const &memberId, stdvector::fwd &ranks); + void getGuildMemberRank(int guildId, NetworkId const &memberId, std::vector &ranks); void setGuildLeader(int guildId, NetworkId const &leaderId); void setGuildElectionEndTime(int guildId, int electionPreviousEndTime, int electionNextEndTime); void setGuildFaction(int guildId, uint32 guildFaction); @@ -77,7 +77,7 @@ public: void calculateGcwImperialScorePercentileForSwg(); void depersistGcwImperialScorePercentile(); - void updateGcwImperialScorePercentile(stdset::fwd const & gcwScoreCategories); + void updateGcwImperialScorePercentile(std::set const & gcwScoreCategories); void updateGcwRegionDefenderBonus(std::string const & gcwScoreCategory); std::map const & getGcwImperialScorePercentile() const; std::map const & getGcwGroupImperialScorePercentile() const; diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp index 92f77f36..1b58d29b 100755 --- a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp @@ -754,7 +754,7 @@ void HarvesterInstallationObject::sendResourceDataToClient(CreatureObject &clien // ---------------------------------------------------------------------- -void HarvesterInstallationObject::getAttributes(stdvector >::fwd &data) const +void HarvesterInstallationObject::getAttributes(std::vector > &data) const { InstallationObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h index 1ea65df3..b6a5729d 100755 --- a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h +++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h @@ -34,7 +34,7 @@ public: virtual Controller* createDefaultController(void); void addMembersToPackages(); virtual float alter(float time); - virtual void getAttributes(stdvector >::fwd &data) const; + virtual void getAttributes(std::vector > &data) const; //simulation functions: virtual void activate (const NetworkId &actorId); @@ -48,9 +48,9 @@ public: virtual void handleCMessageTo (const MessageToPayload &message); //getters - typedef stdvector::fwd ResourceDataVector; + typedef std::vector ResourceDataVector; typedef std::pair HopperContentElement; - typedef stdvector::fwd HopperContentsVector; + typedef std::vector HopperContentsVector; float getHopperContents(HopperContentsVector * data=nullptr) const; void getResourceData(ResourceDataVector & data); @@ -98,7 +98,7 @@ private: Archive::AutoDeltaVariable m_hopperAmount; // amount of resource in the hopper. 0=empty, >0 = hopper containes that quantity of m_hopperResource, <0 = use object variables instead (contains multiple resources) //EPM - stdvector::fwd * m_survey; + std::vector * m_survey; uint32 m_surveyTime; /// Members yet to be implemented. diff --git a/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp index 97ddeef9..0d1cbea1 100755 --- a/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp @@ -325,7 +325,7 @@ void InstallationObject::handleCMessageTo (const MessageToPayload &message) // ---------------------------------------------------------------------- -void InstallationObject::getAttributes(stdvector >::fwd &data) const +void InstallationObject::getAttributes(std::vector > &data) const { TangibleObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/InstallationObject.h b/engine/server/library/serverGame/src/shared/object/InstallationObject.h index 742ae266..d8aa844c 100755 --- a/engine/server/library/serverGame/src/shared/object/InstallationObject.h +++ b/engine/server/library/serverGame/src/shared/object/InstallationObject.h @@ -34,7 +34,7 @@ public: virtual Controller* createDefaultController(void); void addMembersToPackages(); virtual float alter(float time); - virtual void getAttributes(stdvector >::fwd &data) const; + virtual void getAttributes(std::vector > &data) const; virtual void getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const; virtual void setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source); @@ -67,7 +67,7 @@ public: }; }; - typedef stdunordered_set::fwd AllInstallationsSet; + typedef std::unordered_set AllInstallationsSet; static const AllInstallationsSet & getAllInstallations(); protected: diff --git a/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp index ca96eba0..fefa162f 100755 --- a/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp @@ -930,7 +930,7 @@ bool IntangibleObject::setTheaterName(const std::string & name) // ---------------------------------------------------------------------- -void IntangibleObject::getAttributes(stdvector >::fwd &data) const +void IntangibleObject::getAttributes(std::vector > &data) const { ServerObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/IntangibleObject.h b/engine/server/library/serverGame/src/shared/object/IntangibleObject.h index fc2d4cd4..25dd4ff3 100755 --- a/engine/server/library/serverGame/src/shared/object/IntangibleObject.h +++ b/engine/server/library/serverGame/src/shared/object/IntangibleObject.h @@ -46,7 +46,7 @@ public: virtual void onPermanentlyDestroyed(); virtual bool persist(); virtual bool isVisibleOnClient (const Client & client) const; - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; virtual bool onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer); int getCount(void) const; diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h index 14cb8488..ee8855ea 100755 --- a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h +++ b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h @@ -78,7 +78,7 @@ private: class TaskManufactureObject; friend class TaskManufactureObject; - typedef stdvector >::fwd IngredientVector; + typedef std::vector > IngredientVector; void restoreIngredients(IngredientVector const &ingredients); void destroyIngredients(IngredientVector const &ingredients); diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h index 29b29548..4455fc03 100755 --- a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h +++ b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h @@ -151,7 +151,7 @@ public: public: // > typedef std::pair > IngredientInfo; - typedef stdvector::fwd IngredientInfoVector; + typedef std::vector IngredientInfoVector; void getIngredientInfo (IngredientInfoVector & iiv) const; protected: diff --git a/engine/server/library/serverGame/src/shared/object/MissionObject.cpp b/engine/server/library/serverGame/src/shared/object/MissionObject.cpp index fb7504f0..4b851a61 100755 --- a/engine/server/library/serverGame/src/shared/object/MissionObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/MissionObject.cpp @@ -200,7 +200,7 @@ void MissionObject::setMissionHolderId(const NetworkId & h) //----------------------------------------------------------------------- -void MissionObject::getAttributes(stdvector >::fwd &data) const +void MissionObject::getAttributes(std::vector > &data) const { IntangibleObject::getAttributes(data); std::string const & missionType = getMissionTypeString(); diff --git a/engine/server/library/serverGame/src/shared/object/MissionObject.h b/engine/server/library/serverGame/src/shared/object/MissionObject.h index 48b4b729..4d1f1c46 100755 --- a/engine/server/library/serverGame/src/shared/object/MissionObject.h +++ b/engine/server/library/serverGame/src/shared/object/MissionObject.h @@ -44,7 +44,7 @@ public: void endMission (const bool succeeded); const NetworkId & getMissionHolderId () const; - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; /*mission data*/ diff --git a/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h index 7d1cfebc..cb9fde23 100755 --- a/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h +++ b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h @@ -28,12 +28,12 @@ public: ~PatrolPathNodeProperty(); void addRoot(const ServerObject & root); - const stdset::fwd & getRoots() const; + const std::set & getRoots() const; bool hasRoot(const ServerObject & root) const; private: - stdset::fwd * m_roots; + std::set * m_roots; private: PatrolPathNodeProperty(); @@ -44,7 +44,7 @@ private: // ====================================================================== -inline const stdset::fwd & PatrolPathNodeProperty::getRoots() const +inline const std::set & PatrolPathNodeProperty::getRoots() const { return *m_roots; } diff --git a/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h b/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h index 7463ff49..c32a1c02 100755 --- a/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h +++ b/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h @@ -36,12 +36,12 @@ public: void addPatrollingObject(const ServerObject & ai); void removePatrollingObject(const ServerObject & ai); - const stdset >::fwd & getPatrollingObjects() const; + const std::set > & getPatrollingObjects() const; private: int m_observerCount; - stdset >::fwd * m_patrollers; + std::set > * m_patrollers; private: PatrolPathRootProperty(); diff --git a/engine/server/library/serverGame/src/shared/object/PlanetObject.h b/engine/server/library/serverGame/src/shared/object/PlanetObject.h index 63c4b5f3..354bd09c 100755 --- a/engine/server/library/serverGame/src/shared/object/PlanetObject.h +++ b/engine/server/library/serverGame/src/shared/object/PlanetObject.h @@ -54,7 +54,7 @@ public: public: const std::string & getName () const; void setPlanetName (const std::string &newName); - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; //resource pools functions void getAvailableResourceList (std::vector &buffer) const; @@ -72,10 +72,10 @@ public: //-- planetary map support - typedef stdvector::fwd MapLocationVector; - typedef stdmap::fwd MapLocationMap; + typedef std::vector MapLocationVector; + typedef std::map MapLocationMap; typedef Archive::AutoDeltaMap ArchiveMapLocationMap; - typedef stdvector::fwd IntVector; + typedef std::vector IntVector; bool addMapLocation (const MapLocation &location, int mapLocationType, bool enforceLocationCountLimits); bool removeMapLocation (const NetworkId &id); @@ -93,10 +93,10 @@ public: int getNumberOfTravelPoints () const; const TravelPoint* getTravelPoint (int travelPointIndex) const; const TravelPoint* getTravelPoint (const std::string& name) const; - void getTravelPointNameList (stdvector::fwd& travelPointNameList) const; - void getTravelPointPointList (stdvector::fwd& travelPointPointList) const; - void getTravelPointCostList (stdvector::fwd& travelPointCostList) const; - void getTravelPointInterplanetaryList (stdvector::fwd& travelPointInterplanetaryList) const; + void getTravelPointNameList (std::vector& travelPointNameList) const; + void getTravelPointPointList (std::vector& travelPointPointList) const; + void getTravelPointCostList (std::vector& travelPointCostList) const; + void getTravelPointInterplanetaryList (std::vector& travelPointInterplanetaryList) const; std::set, std::pair > > const & getCollectionServerFirst() const; int getCollectionServerFirstUpdateNumber() const; diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp index 5a481653..fdfb79db 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp @@ -3305,7 +3305,7 @@ void PlayerObject::stopCrafting (bool normalExit) // ---------------------------------------------------------------------- -void PlayerObject::getAttributes(stdvector >::fwd &data) const +void PlayerObject::getAttributes(std::vector > &data) const { IntangibleObject::getAttributes(data); } @@ -7862,7 +7862,7 @@ bool PlayerObject::hasCompletedCollectionBook(std::string const & bookName) cons // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector::fwd * collectionInfo /*= nullptr*/) const +int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const & collectionName, std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.h b/engine/server/library/serverGame/src/shared/object/PlayerObject.h index da5386d8..eab82de3 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.h +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.h @@ -63,10 +63,10 @@ public: time_t m_time; }; - typedef stdlist::fwd ChatLog; - typedef stdvector::fwd StringVector; - typedef stdmap::fwd ExperiencePointMap; - typedef stdmap::fwd WaypointMap; + typedef std::list ChatLog; + typedef std::vector StringVector; + typedef std::map ExperiencePointMap; + typedef std::map WaypointMap; typedef Archive::AutoDeltaPackedMap PlayerQuestDataMap; explicit PlayerObject(const ServerPlayerObjectTemplate* newTemplate); @@ -76,7 +76,7 @@ public: virtual PlayerObject const *asPlayerObject() const; static void removeDefaultTemplate(void); - static stdset::fwd const &getAllPlayerObjects(); + static std::set const &getAllPlayerObjects(); void addMembersToPackages (); Waypoint const createWaypoint (const Location & location, bool ignoreLimits); @@ -88,7 +88,7 @@ public: WaypointMap const &getWaypoints () const; void setGroupWaypoints (WaypointMap const &groupWaypointMap); - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; virtual void endBaselines(); virtual void onLoadedFromDatabase(); static std::string getAccountDescription(const ServerObject *); @@ -213,21 +213,21 @@ public: // crafting functions bool isCrafting(void) const; - const stdmap,int>::fwd & getDraftSchematics () const; + const std::map,int> & getDraftSchematics () const; const CachedNetworkId & getCraftingTool () const; void setCraftingTool(const TangibleObject & tool); const CachedNetworkId & getCraftingStation () const; void setCraftingStation(const TangibleObject * station); const DraftSchematicObject * getCurrentDraftSchematic () const; bool requestCraftingSession(const NetworkId & toolId); - void sendUseableDraftSchematics(stdvector::fwd & schematicNames); + void sendUseableDraftSchematics(std::vector & schematicNames); bool requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraftSlots * message, MessageQueueDraftSlotsQueryResponse * queryMessage); void selectDraftSchematic(int index); Crafting::CraftingError fillSlot(int slotIndex, int slotOptionIndex, const NetworkId & ingredientIndex); Crafting::CraftingError emptySlot(int slotIndex, const NetworkId & targetContainer); int goToNextCraftingStage (); int startCraftingExperiment (); - Crafting::CraftingResult experiment(const stdvector::fwd & experiments, int totalPoints, int corelevel); + Crafting::CraftingResult experiment(const std::vector & experiments, int totalPoints, int corelevel); bool customize(int property, int value) const; int setCustomizationData(const Unicode::String & name, int appearanceIndex, const std::vector & customizations, int itemCount) const; bool createPrototype(bool keepPrototype); @@ -276,8 +276,8 @@ public: bool questHasActiveQuestTask(uint32 questCrc, int taskId) const; bool questHasCompletedQuestTask(uint32 questCrc, int taskId) const; uint32 questGetQuestStatus(uint32 const questCrc) const; - stdvector::fwd questGetAllActiveQuestIds() const; - stdvector::fwd questGetAllCompletedQuestIds() const; + std::vector questGetAllActiveQuestIds() const; + std::vector questGetAllCompletedQuestIds() const; bool questPlayerCanClaimRewardFor(uint32 questCrc); uint32 getCurrentQuest() const; @@ -361,8 +361,8 @@ public: bool getCollectionSlotValue(std::string const & slotName, unsigned long & value) const; bool getCollectionSlotValue(CollectionsDataTable::CollectionInfoSlot const & slotInfo, unsigned long & value) const; - bool hasCompletedCollectionSlotPrereq(std::string const & slotName, stdvector::fwd * collectionInfo = nullptr) const; - bool hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, stdvector::fwd * collectionInfo = nullptr) const; + bool hasCompletedCollectionSlotPrereq(std::string const & slotName, std::vector * collectionInfo = nullptr) const; + bool hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, std::vector * collectionInfo = nullptr) const; bool hasCompletedCollectionSlot(std::string const & slotName) const; bool hasCompletedCollectionSlot(CollectionsDataTable::CollectionInfoSlot const & slotInfo) const; @@ -374,17 +374,17 @@ public: bool hasCompletedCollectionBook(std::string const & bookName) const; - int getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector::fwd * collectionInfo = nullptr) const; + int getCompletedCollectionSlotCountInCollection(std::string const & collectionName, std::vector * collectionInfo = nullptr) const; - int getCompletedCollectionSlotCountInPage(std::string const & pageName, stdvector::fwd * collectionInfo = nullptr) const; - int getCompletedCollectionCountInPage(std::string const & pageName, stdvector::fwd * collectionInfo = nullptr) const; + int getCompletedCollectionSlotCountInPage(std::string const & pageName, std::vector * collectionInfo = nullptr) const; + int getCompletedCollectionCountInPage(std::string const & pageName, std::vector * collectionInfo = nullptr) const; - int getCompletedCollectionSlotCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = nullptr) const; - int getCompletedCollectionCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = nullptr) const; - int getCompletedCollectionPageCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = nullptr) const; - int getCompletedCollectionBookCount(stdvector::fwd * collectionInfo = nullptr) const; + int getCompletedCollectionSlotCountInBook(std::string const & bookName, std::vector * collectionInfo = nullptr) const; + int getCompletedCollectionCountInBook(std::string const & bookName, std::vector * collectionInfo = nullptr) const; + int getCompletedCollectionPageCountInBook(std::string const & bookName, std::vector * collectionInfo = nullptr) const; + int getCompletedCollectionBookCount(std::vector * collectionInfo = nullptr) const; - void migrateLegacyBadgesToCollection(stdvector::fwd const & badges); + void migrateLegacyBadgesToCollection(std::vector const & badges); // chat spam info int getChatSpamSpatialNumCharacters() const; @@ -530,7 +530,7 @@ private: Archive::AutoDeltaVariable m_craftingTool; // tool a player is crafting with Archive::AutoDeltaVariable m_craftingStation; // station a player is crafting with Archive::AutoDeltaVariable m_craftingComponentBioLink;// bio-link id of a component - stdvector::fwd m_useableDraftSchematics; // draft schematics a player may currently select from + std::vector m_useableDraftSchematics; // draft schematics a player may currently select from ConstWatcher m_draftSchematic; // draft schematic the player is crafting with static bool m_allowEmptySlot; // flag to allow emptySlot() to be called when not in the crafting assembly stage. @@ -740,7 +740,7 @@ inline int32 PlayerObject::getSessionLastActiveTime() const // ---------------------------------------------------------------------- -inline const stdmap,int>::fwd & PlayerObject::getDraftSchematics () const +inline const std::map,int> & PlayerObject::getDraftSchematics () const { return m_draftSchematics.getMap(); } diff --git a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp index dca33824..40969fd6 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp @@ -169,7 +169,7 @@ void PlayerQuestObject::endBaselines() //----------------------------------------------------------------------- -void PlayerQuestObject::getAttributes(stdvector >::fwd &data) const +void PlayerQuestObject::getAttributes(std::vector > &data) const { TangibleObject::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h index b60b1d0c..229513d7 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h +++ b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h @@ -31,7 +31,7 @@ public: virtual bool onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer); virtual int onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer); - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; virtual void onAddedToWorld (); diff --git a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp index 398adf07..9c53ba88 100755 --- a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp @@ -516,7 +516,7 @@ std::string ResourceContainerObject::getItemLog() const // ---------------------------------------------------------------------- -void ResourceContainerObject::getAttributes(stdvector >::fwd &data) const +void ResourceContainerObject::getAttributes(std::vector > &data) const { TangibleObject::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h index 8dcaee0b..b802bb98 100755 --- a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h +++ b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h @@ -29,7 +29,7 @@ class ResourceContainerObject : public TangibleObject // Container transfers bool addResource (const NetworkId &resourceType, int amount, const NetworkId &sourcePlayer); bool addResource (ResourceTypeObject const * const resourceType, int amount, NetworkId const & sourcePlayer); - bool removeResource (const NetworkId &resourceType, int amount, stdvector >::fwd *sources); + bool removeResource (const NetworkId &resourceType, int amount, std::vector > *sources); bool removeResourceWithoutExperience(const NetworkId &resourceType, int amount); //TODO: rewrite crafting to handle experience, remove this function bool transferTo (ResourceContainerObject &destination, int amount); bool splitContainer (int amount, const CachedNetworkId &destContainer, int arrangementId, const Vector &newLocation, ServerObject *actor); @@ -44,7 +44,7 @@ class ResourceContainerObject : public TangibleObject void setResourceCtsData(int quantity, const std::string & resourceData); std::string debugPrint () const; - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; virtual void endBaselines (); virtual std::string getItemLog() const; diff --git a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp index d0b9123a..8a783fd3 100755 --- a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp @@ -231,7 +231,7 @@ void ResourceTypeObject::getCrateTemplate(std::string &buffer) const /** * Get only those attributes specific to the resource */ -void ResourceTypeObject::getResourceAttributes (stdvector >::fwd &data) const +void ResourceTypeObject::getResourceAttributes (std::vector > &data) const { for (AttributesType::const_iterator i=m_attributes.begin(); i!=m_attributes.end(); ++i) { diff --git a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h index ab7cd184..23c206b6 100755 --- a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h +++ b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h @@ -56,8 +56,8 @@ class ResourceTypeObject bool hasPoolForPlanet (const NetworkId &planet) const; bool isDerivedFrom (const ResourceClassObject &masterClass) const; void getCrateTemplate (std::string &buffer) const; - void getResourceAttributes (stdvector >::fwd &data) const; - const stdmap::fwd & getResourceAttributes () const; + void getResourceAttributes (std::vector > &data) const; + const std::map & getResourceAttributes () const; ResourceFractalData const & getFractalData() const; uint32 getDepletedTimestamp() const; void deplete (); diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index ac399d32..2b558c54 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -7327,7 +7327,7 @@ std::string ServerObject::getLogDescription(const ServerObject * source) void ServerObject::retrieveStoredObjectAttributes (AttributeVector & av) const { - typedef stdvector::fwd UnicodeStringVector; + typedef std::vector UnicodeStringVector; static UnicodeStringVector kv; static UnicodeStringVector vv; @@ -7358,7 +7358,7 @@ void ServerObject::retrieveStoredObjectAttributes (AttributeVector & av) const void ServerObject::storeObjectAttributes (const ServerObject & prototype) { - typedef stdvector::fwd UnicodeStringVector; + typedef std::vector UnicodeStringVector; static UnicodeStringVector kv; static UnicodeStringVector vv; @@ -7398,7 +7398,7 @@ void ServerObject::clearStoredObjectAttributes () void ServerObject::replaceStoredObjectAttribute(Unicode::String const & attribute, Unicode::String const & value) { - typedef stdvector::fwd UnicodeStringVector; + typedef std::vector UnicodeStringVector; static UnicodeStringVector kv; static UnicodeStringVector vv; diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.h b/engine/server/library/serverGame/src/shared/object/ServerObject.h index 5cdaed82..24fbd6e8 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.h +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.h @@ -381,12 +381,12 @@ public: int getTotalMoney () const; public: - void scriptTransferCashTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector::fwd &packedDictionary); - void scriptTransferBankCreditsTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector::fwd &packedDictionary); - void scriptWithdrawCashFromBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector::fwd &packedDictionary); - void scriptDepositCashToBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector::fwd &packedDictionary); - void scriptTransferBankCreditsTo (const std::string &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector::fwd &packedDictionary); - void scriptTransferBankCreditsFrom(const std::string &source, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector::fwd &packedDictionary); + void scriptTransferCashTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector &packedDictionary); + void scriptTransferBankCreditsTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector &packedDictionary); + void scriptWithdrawCashFromBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector &packedDictionary); + void scriptDepositCashToBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector &packedDictionary); + void scriptTransferBankCreditsTo (const std::string &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector &packedDictionary); + void scriptTransferBankCreditsFrom(const std::string &source, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector &packedDictionary); void sendControllerMessageToAuthServer(GameControllerMessage cm, MessageQueue::Data *msg, float value = 0.0f); static std::string getLogDescription(const ServerObject * object); @@ -478,7 +478,7 @@ public: public: - void addSynchronizedUi (const stdvector::fwd & clients); + void addSynchronizedUi (const std::vector & clients); void addSynchronizedUiClient (ServerObject & client); bool areContentsVisibleToClient (const Client &) const; void attachStartupScripts (); @@ -489,7 +489,7 @@ public: const int getCacheVersion () const; Client * getClient () const; int getObserversCount () const; - stdset::fwd const & getObservers () const; + std::set const & getObservers () const; void addObserver (Client * client); void removeObserver (Client * client); void clearObservers (); @@ -508,22 +508,22 @@ public: void eraseObjVarListEntries(std::string const &name); void copyObjVars(std::string const &name, ServerObject const &srcObject, std::string const &srcVarName); bool setObjVarItem(std::string const &name, int value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, float value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, std::string const &value); bool setObjVarItem(std::string const &name, Unicode::String const &value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, NetworkId const &value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, DynamicVariableLocationData const &value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, StringId const &value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, Transform const &value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, Vector const &value); - bool setObjVarItem(std::string const &name, stdvector::fwd const &value); + bool setObjVarItem(std::string const &name, std::vector const &value); bool setObjVarItem(std::string const &name, DynamicVariable const &value); std::string const getPackedObjVars(std::string const &prefix) const; @@ -566,7 +566,7 @@ public: void sendCreateAndBaselinesToDatabaseServer() const; void forwardServerCreateAndBaselines() const; void sendToClientsInUpdateRange (const GameNetworkMessage & message, bool reliable, bool includeSelf=true) const; - static void sendToSpecifiedClients (const GameNetworkMessage & message, bool reliable, const stdvector::fwd & clients); + static void sendToSpecifiedClients (const GameNetworkMessage & message, bool reliable, const std::vector & clients); void appendMessage (int message, float value, uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); void appendMessage (int message, float value, MessageQueue::Data *data, uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); virtual void setAuthServerProcessId (uint32 processId); @@ -592,7 +592,7 @@ public: void updatePositionOnPlanetServer (bool forceUpdate = false); int getGameObjectType () const; - typedef stdvector >::fwd AttributeVector; + typedef std::vector > AttributeVector; virtual void getAttributes (AttributeVector &data) const = 0; virtual void getAttributes (const NetworkId & playerId, AttributeVector &data) const; virtual void getAttributesForAuction (AttributeVector &data) const; @@ -616,7 +616,7 @@ public: void setLayer (TerrainGenerator::Layer* layer); TerrainGenerator::Layer* getLayer () const; - virtual void getAuthClients(stdset::fwd &authClients) const; + virtual void getAuthClients(std::set &authClients) const; virtual void setCacheVersion (const int cacheVersion); void setDefaultAlterTime(float time); @@ -628,7 +628,7 @@ public: // ai patrol pathing support void setPatrolPathRoot (const ServerObject & root); - const stdset::fwd & getPatrolPathRoots () const; + const std::set & getPatrolPathRoots () const; void addPatrolPathingObject (const ServerObject & ai); void removePatrolPathingObject (const ServerObject & ai); void addPatrolPathObserver (); @@ -788,7 +788,7 @@ private: Watcher m_synchronizedUi; // list of objects with sync ui that are waiting for this object to have a client // attached, due to an authority transfer - stdvector::fwd * m_pendingSyncUi; + std::vector * m_pendingSyncUi; /** Flag for whether the object is persisted */ @@ -1055,7 +1055,7 @@ inline int ServerObject::getObserversCount() const //----------------------------------------------------------------------- -inline stdset::fwd const &ServerObject::getObservers() const +inline std::set const &ServerObject::getObservers() const { return m_observers; } diff --git a/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h index 7888218c..21175b66 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h +++ b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h @@ -40,8 +40,8 @@ class ServerResourceClassObject : public ResourceClassObject virtual void debugOutput (std::string &output, int numSpaces=0) const; int numTypesCouldSpawn () const; int getNumTypes () const; - void getResourceTypes (stdvector::fwd & types) const; - void getAllDerivedResourceTypes(stdvector::fwd & types) const; + void getResourceTypes (std::vector & types) const; + void getAllDerivedResourceTypes(std::vector & types) const; bool hasDerivedResourceType() const; ResourceTypeObject const * getAResourceType() const; ResourceFractalData const & getFractalData() const; @@ -56,7 +56,7 @@ class ServerResourceClassObject : public ResourceClassObject void checkRanges (); void checkAttributeLimits(); void spawnAsNeeded (); - static void loadDistributionFromIff (stdmap::fwd &resourceClasses); + static void loadDistributionFromIff (std::map &resourceClasses); private: // simulation helper functions diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject.h b/engine/server/library/serverGame/src/shared/object/ShipObject.h index eb19d5a0..a1299623 100755 --- a/engine/server/library/serverGame/src/shared/object/ShipObject.h +++ b/engine/server/library/serverGame/src/shared/object/ShipObject.h @@ -56,10 +56,10 @@ public: static ShipObject const * asShipObject(Object const * object); static ShipObject * asShipObject(Object * object); - typedef stdvector::fwd IntVector; - typedef stdmap::fwd NetworkIdIntMap; + typedef std::vector IntVector; + typedef std::map NetworkIdIntMap; typedef std::pair ResourceTypeInfoPair; - typedef stdmap::fwd ResourceTypeInfoMap; + typedef std::map ResourceTypeInfoMap; public: @@ -86,7 +86,7 @@ public: CreatureObject const *getPilot() const; CreatureObject *getPilot(); - void findAllPassengers(stdvector::fwd & passengers, bool onlyPlayerControlled); + void findAllPassengers(std::vector & passengers, bool onlyPlayerControlled); Vector getCurrentVelocity_p() const; Vector getTargetLead_p(const Vector & startPosition_p, float projectileSpeed) const; @@ -149,7 +149,7 @@ public: bool getSlotTargetable(ShipChassisSlotType::Type slot) const; bool isValidTargetableSlot (ShipChassisSlotType::Type slot) const; int findTargetChassisSlotByPosition(Vector const & position_o) const; - void findTransformsForComponent(int const chassisSlot, stdvector::fwd & transforms) const; + void findTransformsForComponent(int const chassisSlot, std::vector & transforms) const; AppearanceTemplate const * getExteriorAppearance() const; int getNumberOfHits() const; @@ -444,7 +444,7 @@ public: float getChassisSpeedMaximumModifier() const; void setChassisSpeedMaximumModifier(float f); - virtual void getAuthClients(stdset::fwd &authClients) const; + virtual void getAuthClients(std::set &authClients) const; void stopFiringWeapon(int weaponIndex); @@ -613,7 +613,7 @@ private: float m_timeSinceLastPowerPulse; - typedef stdvector::fwd FireShotQueue; + typedef std::vector FireShotQueue; FireShotQueue * m_fireShotQueue; static float const ms_powerPulsePeriodSecs; diff --git a/engine/server/library/serverGame/src/shared/object/StaticObject.cpp b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp index 35366239..ddaaba0c 100755 --- a/engine/server/library/serverGame/src/shared/object/StaticObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp @@ -156,7 +156,7 @@ bool StaticObject::canDropInWorld() const //----------------------------------------------------------------------- -void StaticObject::getAttributes(stdvector >::fwd &data) const +void StaticObject::getAttributes(std::vector > &data) const { ServerObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/StaticObject.h b/engine/server/library/serverGame/src/shared/object/StaticObject.h index 0d1c057b..531c6d7a 100755 --- a/engine/server/library/serverGame/src/shared/object/StaticObject.h +++ b/engine/server/library/serverGame/src/shared/object/StaticObject.h @@ -31,7 +31,7 @@ public: virtual bool canDropInWorld() const; virtual bool isVisibleOnClient (const Client & client) const; - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; protected: diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp index 13768966..34d2ce8b 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp @@ -5350,7 +5350,7 @@ bool TangibleObject::isOnAdminList(const CreatureObject& player) const // 1) All player are stored as network IDs represented as a string // 2) All guilds are stored as guild IDs represted as a string and prefixed with "guild:" - typedef stdvector::fwd StringVector; + typedef std::vector StringVector; static StringVector sv; sv.clear (); @@ -5390,7 +5390,7 @@ bool TangibleObject::isOnHopperList(const CreatureObject& player) const // 1) All player are stored as network IDs represented as a string // 2) All guilds are stored as guild IDs represted as a string and prefixed with "guild:" - typedef stdvector::fwd StringVector; + typedef std::vector StringVector; static StringVector sv; sv.clear (); diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.h b/engine/server/library/serverGame/src/shared/object/TangibleObject.h index f4b80817..338cc71a 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.h +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.h @@ -52,7 +52,7 @@ namespace CombatEngineData struct CombatData; struct DamageData; - typedef stdvector::fwd TargetIdList; + typedef std::vector TargetIdList; }; namespace LocalObjectFlags @@ -224,7 +224,7 @@ public: virtual void unload(); virtual void onPermanentlyDestroyed(); - void getEquippedItems(uint32 combatBone, stdvector::fwd & items) const; + void getEquippedItems(uint32 combatBone, std::vector & items) const; TangibleObject * getRandomEquippedItem(uint32 combatBone) const; @@ -287,7 +287,7 @@ public: bool addSkillModSocketBonuses(const std::vector > & skillModBonuses); int getSkillModSockets(void) const; void setSkillModSockets(int sockets); - void getRequiredCertifications(stdvector::fwd & results) const; + void getRequiredCertifications(std::vector & results) const; void forceExecuteCommand(Command const &command, NetworkId const &targetId, Unicode::String const ¶ms, Command::ErrorCode &status, bool commandIsFromCommandQueue); virtual void setOwnerId(const NetworkId &id); @@ -354,7 +354,7 @@ public: bool isInNpcConversation () const; void addConversation (const NetworkId & conversant); void removeConversation (const NetworkId & conversant); - const stdvector::fwd & getConversations () const; + const std::vector & getConversations () const; void handlePlayerResponseToNpcConversation (const std::string & conversationName, const NetworkId & player, const StringId & response, const ProsePackage & pp); virtual void setCacheVersion (const int cacheVersion); @@ -761,7 +761,7 @@ inline bool TangibleObject::isInNpcConversation () const //----------------------------------------------------------------------- -inline const stdvector::fwd & TangibleObject::getConversations () const +inline const std::vector & TangibleObject::getConversations () const { return m_conversations.get (); } diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp index fbf7881e..2c3f7434 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp @@ -174,7 +174,7 @@ void TangibleObject::endNpcConversation() { // since m_conversations will be changed as players are forced out // of the conversation, we need to make a copy of our conversants - typedef stdvector::fwd NetworkIdVector; + typedef std::vector NetworkIdVector; NetworkIdVector conversants(m_conversations.get()); { diff --git a/engine/server/library/serverGame/src/shared/object/TriggerVolume.h b/engine/server/library/serverGame/src/shared/object/TriggerVolume.h index a6b661e1..8c89d4f2 100755 --- a/engine/server/library/serverGame/src/shared/object/TriggerVolume.h +++ b/engine/server/library/serverGame/src/shared/object/TriggerVolume.h @@ -60,7 +60,7 @@ public: void setSpatialSubdivisionHandle(SpatialSubdivisionHandle *newHandle); void objectMoved(ServerObject &object); void objectDestroyed(ServerObject &object); - void contentsChanged(stdvector::fwd const &newSortedContents); + void contentsChanged(std::vector const &newSortedContents); static void runScriptTriggers(); virtual bool isNetworkTriggerVolume() const; diff --git a/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp index 6e6b8d6c..a492f514 100755 --- a/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp @@ -138,7 +138,7 @@ bool UniverseObject::isVisibleOnClient (const Client & /*client*/) const // ---------------------------------------------------------------------- -void UniverseObject::getAttributes(stdvector >::fwd &data) const +void UniverseObject::getAttributes(std::vector > &data) const { ServerObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/UniverseObject.h b/engine/server/library/serverGame/src/shared/object/UniverseObject.h index 73974909..7b124f2b 100755 --- a/engine/server/library/serverGame/src/shared/object/UniverseObject.h +++ b/engine/server/library/serverGame/src/shared/object/UniverseObject.h @@ -35,7 +35,7 @@ public: virtual void onServerUniverseGainedAuthority(); virtual bool isVisibleOnClient (const Client & client) const; - virtual void getAttributes (stdvector >::fwd &data) const; + virtual void getAttributes (std::vector > &data) const; bool isDynamicRegion() const; const Region * getDynamicRegion() const; diff --git a/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp b/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp index f5a9f8b1..1fd3449a 100755 --- a/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp @@ -45,7 +45,7 @@ Controller* VehicleObject::createDefaultController(void) //----------------------------------------------------------------------- -void VehicleObject::getAttributes(stdvector >::fwd &data) const +void VehicleObject::getAttributes(std::vector > &data) const { TangibleObject::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/object/VehicleObject.h b/engine/server/library/serverGame/src/shared/object/VehicleObject.h index bfa1364d..40926ea7 100755 --- a/engine/server/library/serverGame/src/shared/object/VehicleObject.h +++ b/engine/server/library/serverGame/src/shared/object/VehicleObject.h @@ -25,7 +25,7 @@ public: virtual Controller* createDefaultController (void); void addMembersToPackages (); - void getAttributes (stdvector >::fwd &data) const; + void getAttributes (std::vector > &data) const; public: int getBogus() const; diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h index 75523bdb..764c259b 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h @@ -155,7 +155,7 @@ private: IntegerParam m_rating; // armor rating IntegerParam m_integrity; // integrity IntegerParam m_effectiveness; // default effectiveness (0 = only use special protection) - stdvector::fwd m_specialProtection; // damage-type specific protection + std::vector m_specialProtection; // damage-type specific protection bool m_specialProtectionLoaded; bool m_specialProtectionAppend; IntegerParam m_vulnerability; // damaga types that this armor doesn't protect against diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h index 17478495..0bafb015 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h @@ -120,7 +120,7 @@ private: FloatParam m_maxDrainModifier; // //max drain rate in units/sec FloatParam m_minFaucetModifier; // //min regeneration rate in units/sec FloatParam m_maxFaucetModifier; // //max regeneration rate in units/sec - stdvector::fwd m_attribMods; // //(de)buffs the creature is created with + std::vector m_attribMods; // //(de)buffs the creature is created with bool m_attribModsLoaded; bool m_attribModsAppend; IntegerParam m_shockWounds; // //current shock wounds diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h index a13fec2d..f8710e00 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h @@ -50,7 +50,7 @@ public: { bool optional; StringId name; - stdvector::fwd options; + std::vector options; std::string optionalSkillCommand; float complexity; std::string appearance; @@ -97,7 +97,7 @@ protected: private: BoolParam m_optional; // is the slot optional StringIdParam m_name; // slot name - stdvector::fwd m_options; // possible ingredients that can be used to fill the slot + std::vector m_options; // possible ingredients that can be used to fill the slot bool m_optionsLoaded; bool m_optionsAppend; StringParam m_optionalSkillCommand; // skill commands needed to access this slot if it is optional (ignored for required slots) @@ -148,14 +148,14 @@ private: IntegerParam m_category; // schematic category (food, weapon, etc) StringParam m_craftedObjectTemplate; // what object we create StringParam m_crateObjectTemplate; // the "crate" to use when manufacturing multiple copies of the object - stdvector::fwd m_slots; // ingredient slots + std::vector m_slots; // ingredient slots bool m_slotsLoaded; bool m_slotsAppend; - stdvector::fwd m_skillCommands; // skill commands needed to access this schematic and required slots + std::vector m_skillCommands; // skill commands needed to access this schematic and required slots bool m_skillCommandsLoaded; bool m_skillCommandsAppend; BoolParam m_destroyIngredients; // flag that the ingredients used in the design stage should be destroyed - stdvector::fwd m_manufactureScripts; // scripts that will be attached to a manufacturing schematic created from this schematic + std::vector m_manufactureScripts; // scripts that will be attached to a manufacturing schematic created from this schematic bool m_manufactureScriptsLoaded; bool m_manufactureScriptsAppend; IntegerParam m_itemsPerContainer; // when manufacturing, how many items will be put in a container (1 = items not in a container) diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h index 6c9bf227..f4720ff0 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h @@ -68,7 +68,7 @@ public: struct Ingredient { enum IngredientType ingredientType; - stdvector::fwd ingredients; + std::vector ingredients; float complexity; std::string skillCommand; }; @@ -161,7 +161,7 @@ protected: private: IntegerParam m_ingredientType; // type of ingredient required - stdvector::fwd m_ingredients; // ingredients to be used/being used + std::vector m_ingredients; // ingredients to be used/being used bool m_ingredientsLoaded; bool m_ingredientsAppend; FloatParam m_complexity; // adjustment to complexity by using this ingredient diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h index d7853c72..cae6edd7 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h @@ -121,11 +121,11 @@ protected: private: StringParam m_draftSchematic; // source draft schematic StringParam m_creator; // who created me - stdvector::fwd m_ingredients; // ingredients needed to create + std::vector m_ingredients; // ingredients needed to create bool m_ingredientsLoaded; bool m_ingredientsAppend; IntegerParam m_itemCount; // number of items this schematic can make - stdvector::fwd m_attributes; // values for the attributes the schematic affects + std::vector m_attributes; // values for the attributes the schematic affects bool m_attributesLoaded; bool m_attributesAppend; //@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h index 774c30f6..c13a3ede 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h @@ -547,28 +547,28 @@ private: // this enum is also defined in the shared draft_schematic_object_template.tdf file // this enum is also defined in the shared draft_schematic_object_template.tdf file StringParam m_sharedTemplate; // //template the client should associate with this template - stdvector::fwd m_scripts; // //scripts attached to the object + std::vector m_scripts; // //scripts attached to the object bool m_scriptsLoaded; bool m_scriptsAppend; DynamicVariableParam m_objvars; // //default objvars added to the object IntegerParam m_volume; // //how much room does the object take up - stdvector::fwd m_visibleFlags; // //who can see this object + std::vector m_visibleFlags; // //who can see this object bool m_visibleFlagsLoaded; bool m_visibleFlagsAppend; - stdvector::fwd m_deleteFlags; // //who can delete this object + std::vector m_deleteFlags; // //who can delete this object bool m_deleteFlagsLoaded; bool m_deleteFlagsAppend; - stdvector::fwd m_moveFlags; // //who can move this object + std::vector m_moveFlags; // //who can move this object bool m_moveFlagsLoaded; bool m_moveFlagsAppend; BoolParam m_invulnerable; // //can this object not be destroyed/killed FloatParam m_complexity; // //how hard this item is to craft (?) IntegerParam m_tintIndex; // //index into client tint palette FloatParam m_updateRanges[3]; // //distances for network updates - stdvector::fwd m_contents; // //what's in this object + std::vector m_contents; // //what's in this object bool m_contentsLoaded; bool m_contentsAppend; - stdvector::fwd m_xpPoints; // //experience points for interacting with this object + std::vector m_xpPoints; // //experience points for interacting with this object bool m_xpPointsLoaded; bool m_xpPointsAppend; BoolParam m_persistByDefault; // //flag to automatically persist this object on creation diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h index 73292939..deae497a 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h @@ -120,7 +120,7 @@ private: // //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/script/base_class.java // //depot/swg/current/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h // //depot/swg/current/src/engine/server/library/serverGame/src/shared/object/TangibleObject.h - stdvector::fwd m_triggerVolumes; // trigger volume(s) attached to the object + std::vector m_triggerVolumes; // trigger volume(s) attached to the object bool m_triggerVolumesLoaded; bool m_triggerVolumesAppend; IntegerParam m_combatSkeleton; // this should be fixed (not random) for any template type diff --git a/engine/server/library/serverGame/src/shared/pvp/Pvp.h b/engine/server/library/serverGame/src/shared/pvp/Pvp.h index 64936a90..bc94ba13 100755 --- a/engine/server/library/serverGame/src/shared/pvp/Pvp.h +++ b/engine/server/library/serverGame/src/shared/pvp/Pvp.h @@ -64,7 +64,7 @@ public: static bool hasAnyBountyDuelEnemyFlag (TangibleObject const &who); static bool hasAnyGuildWarCoolDownPeriodEnemyFlag(TangibleObject const &who); static bool isDuelingAllowed (TangibleObject const &actor, TangibleObject const &target); - static void getPersonalEnemyIds (TangibleObject const &who, stdvector::fwd &enemyIds); + static void getPersonalEnemyIds (TangibleObject const &who, std::vector &enemyIds); // pvp setup static void setAlignedFaction (TangibleObject &who, FactionId factionId); @@ -145,13 +145,13 @@ public: static GcwScoreCategory const * getGcwScoreCategory(std::string const & scoreCategory); static GcwScoreCategory const * getGcwScoreDefaultCategoryForPlanet(std::string const & planetName); - static stdmap::fwd const & getAllGcwScoreCategory(); - static stdmap, float> >::fwd >::fwd const & getGcwScoreCategoryRegions(); + static std::map const & getAllGcwScoreCategory(); + static std::map, float> > > const & getGcwScoreCategoryRegions(); static std::string const & getGcwScoreCategoryRegion(std::string const & planetName, Vector const & position_w); - static stdmap::fwd >::fwd const & getGcwScoreCategoryGroups(); + static std::map > const & getGcwScoreCategoryGroups(); static bool getGcwScoreCategoryGroupTotalPoints(std::string const & group, std::string const & category, int & totalPoints); - static int calculateGcwImperialScorePercentile(std::string const & gcwCategory, stdmap >::fwd const & gcwImperialScore, stdmap >::fwd const & gcwRebelScore); - static int calculateGcwImperialScorePercentile(std::string const & gcwCategory, stdmap >::fwd const & gcwImperialScore, stdmap >::fwd const & gcwRebelScore); + static int calculateGcwImperialScorePercentile(std::string const & gcwCategory, std::map > const & gcwImperialScore, std::map > const & gcwRebelScore); + static int calculateGcwImperialScorePercentile(std::string const & gcwCategory, std::map > const & gcwImperialScore, std::map > const & gcwRebelScore); static float getGcwDefenderRegionImperialBonus(std::string const & scoreCategory); static float getGcwDefenderRegionRebelBonus(std::string const & scoreCategory); static bool getGcwDefenderRegionBonus(CreatureObject const & creature, PlayerObject const & player, float & bonus); diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpFactions.h b/engine/server/library/serverGame/src/shared/pvp/PvpFactions.h index 816cfe7d..9840fed1 100755 --- a/engine/server/library/serverGame/src/shared/pvp/PvpFactions.h +++ b/engine/server/library/serverGame/src/shared/pvp/PvpFactions.h @@ -22,7 +22,7 @@ public: static bool isUnattackableFaction(Pvp::FactionId factionId); static bool isBountyTargetFaction(Pvp::FactionId factionId); static bool isBubbleFaction(Pvp::FactionId factionId); - static stdvector::fwd const &getOpposingFactions(Pvp::FactionId factionId); + static std::vector const &getOpposingFactions(Pvp::FactionId factionId); static Pvp::FactionId getBattlefieldFactionId(); static Pvp::FactionId getDuelFactionId(); static Pvp::FactionId getBountyDuelFactionId(); diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpInternal.h b/engine/server/library/serverGame/src/shared/pvp/PvpInternal.h index f5ce3051..49724a42 100755 --- a/engine/server/library/serverGame/src/shared/pvp/PvpInternal.h +++ b/engine/server/library/serverGame/src/shared/pvp/PvpInternal.h @@ -31,7 +31,7 @@ public: static TangibleObject const *getPetMaster (TangibleObject const &who); static TangibleObject *getPetMaster (TangibleObject &who); static bool inSameGroup (TangibleObject const &obj1, TangibleObject const &obj2); - static void getGroupMembers (TangibleObject const &src, stdvector::fwd &members); + static void getGroupMembers (TangibleObject const &src, std::vector &members); static Pvp::FactionId getAlignedFaction (TangibleObject const &who); static Pvp::FactionId getAlignedFaction (NetworkId const &who); static bool hasAnyEnemyFlag (TangibleObject const &who); @@ -46,7 +46,7 @@ public: static bool hasPersonalEnemyFlag (TangibleObject const &who, NetworkId const &enemyId); static bool hasBubbleCombatFlag (TangibleObject const &who); static bool hasBubbleCombatFlagAgainstTarget (TangibleObject const &who, NetworkId const &enemyId); - static void getPersonalEnemyIds (TangibleObject const &who, stdvector::fwd &enemyIds); + static void getPersonalEnemyIds (TangibleObject const &who, std::vector &enemyIds); static Pvp::FactionId battlefieldGetFaction (TangibleObject const &who, RegionPvp const ®ion); static bool battlefieldIsParticipant (TangibleObject const &who, RegionPvp const ®ion); static void battlefieldSetParticipant (TangibleObject const &who, RegionPvp const ®ion, Pvp::FactionId factionId); diff --git a/engine/server/library/serverGame/src/shared/region/RegionMaster.h b/engine/server/library/serverGame/src/shared/region/RegionMaster.h index cc8dcd61..a04a575f 100755 --- a/engine/server/library/serverGame/src/shared/region/RegionMaster.h +++ b/engine/server/library/serverGame/src/shared/region/RegionMaster.h @@ -39,7 +39,7 @@ public: public: - typedef stdvector::fwd RegionVector; + typedef std::vector RegionVector; static void install(); static void exit(); @@ -73,11 +73,11 @@ private: static bool setDynamicSpawnRegionObjectData (UniverseObject & object, const Unicode::String & name, const std::string & planet, int geometry, float minX, float minZ, float maxX, float maxZ, int pvp, int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable, int mission, bool visible, bool notify, std::string spawntable, int duration); // we need to get regions by position or name, so we have fast lookup // structures for both, at the expense of using more memory - typedef stdmap::fwd RegionsMappedByName; + typedef std::map RegionsMappedByName; struct RegionData; // regions per planet - static stdmap::fwd ms_planetRegions; + static std::map ms_planetRegions; // regions created from the region datatables static RegionVector ms_staticRegions; diff --git a/engine/server/library/serverGame/src/shared/space/MissileManager.cpp b/engine/server/library/serverGame/src/shared/space/MissileManager.cpp index 512696ff..f79bf1c7 100755 --- a/engine/server/library/serverGame/src/shared/space/MissileManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/MissileManager.cpp @@ -272,7 +272,7 @@ bool MissileManager::isTargetedByMissile(const NetworkId &target) const /** * Get a list of all the unlocked missiles aimed at the specified target. */ -void MissileManager::getAllUnlockedMissilesForTarget(const NetworkId &target, stdvector::fwd &results) const +void MissileManager::getAllUnlockedMissilesForTarget(const NetworkId &target, std::vector &results) const { const std::pair range=m_missilesForTarget.equal_range(target); diff --git a/engine/server/library/serverGame/src/shared/space/MissileManager.h b/engine/server/library/serverGame/src/shared/space/MissileManager.h index 4e3f5d0d..1c333004 100755 --- a/engine/server/library/serverGame/src/shared/space/MissileManager.h +++ b/engine/server/library/serverGame/src/shared/space/MissileManager.h @@ -30,7 +30,7 @@ class MissileManager public: int getNearestUnlockedMissileForTarget (const NetworkId &target) const; bool isTargetedByMissile (const NetworkId &target) const; - void getAllUnlockedMissilesForTarget (const NetworkId &target, stdvector::fwd &results) const; + void getAllUnlockedMissilesForTarget (const NetworkId &target, std::vector &results) const; bool destroyMissile (int missileId); bool requestFireMissile (const NetworkId &sourcePlayer, const NetworkId &sourceShip, const NetworkId &targetShip, int weaponIndex, int missileType, ShipChassisSlotType::Type targetedComponent); diff --git a/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp index 910cbcc3..1a48d8bf 100755 --- a/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp +++ b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp @@ -44,11 +44,11 @@ namespace NebulaManagerServerNamespace { - typedef stdvector::fwd LightningDataVector; + typedef std::vector LightningDataVector; LightningDataVector s_lightningDataVector; - typedef stdmap::fwd NetworkIdTimeMap; + typedef std::map NetworkIdTimeMap; NetworkIdTimeMap s_objectsRecentlyHitByLightning; static uint16 s_lastLightningId = 0; @@ -190,7 +190,7 @@ void NebulaManagerServer::handleEnqueuedLightningEvents() continue; } - typedef stdvector::fwd ObjectVector; + typedef std::vector ObjectVector; static ObjectVector collidingObjects; collidingObjects.clear(); diff --git a/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp b/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp index 2354ae60..8c5b4471 100755 --- a/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp @@ -311,7 +311,7 @@ namespace ProjectileManagerNamespace //---------------------------------------------------------------------- typedef std::pair ShipWeaponPair; - typedef stdmap::fwd ProjectileMap; + typedef std::map ProjectileMap; ProjectileMap s_projectileBeamMap; diff --git a/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.h b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.h index aaf10145..d6c77102 100755 --- a/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.h +++ b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.h @@ -35,14 +35,14 @@ public: private: static void remove(); - static void getServerAsteroidData(stdvector::fwd & /*OUT*/ spheres); - static void sendServerAsteroidDataToPlayer(NetworkId const & player, stdvector::fwd const & spheres); + static void getServerAsteroidData(std::vector & /*OUT*/ spheres); + static void sendServerAsteroidDataToPlayer(NetworkId const & player, std::vector const & spheres); private: static FieldHandle const BAD_HANDLE; static FieldHandle s_nextHandle; - static stdset::fwd ms_playersListeningForServerAsteroidDebugData; - static stdvector::fwd ms_asteroids; + static std::set ms_playersListeningForServerAsteroidDebugData; + static std::vector ms_asteroids; private: //disabled diff --git a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp index 0fc6e7a6..156b37ab 100755 --- a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp +++ b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp @@ -218,7 +218,7 @@ void ServerShipComponentData::printDebugString (Unicode::String & result, U //---------------------------------------------------------------------- -void ServerShipComponentData::getAttributes(stdvector >::fwd & data) const +void ServerShipComponentData::getAttributes(std::vector > & data) const { //everything is handled in the shared, base class ShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.h b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.h index 8ce1a5b9..ed636ab5 100755 --- a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.h +++ b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.h @@ -28,7 +28,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ServerShipComponentData (const ServerShipComponentData & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.cpp index dc8f3896..60b72fbc 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.cpp @@ -82,7 +82,7 @@ void ShipComponentDataArmor::printDebugString (Unicode::String & result, Un //---------------------------------------------------------------------- -void ShipComponentDataArmor::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataArmor::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.h index 90d639a0..eb4aa902 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.h @@ -29,7 +29,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataArmor (const ShipComponentDataArmor & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.cpp index b44c0311..85c36866 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.cpp @@ -155,7 +155,7 @@ void ShipComponentDataBooster::printDebugString (Unicode::String & result, //---------------------------------------------------------------------- -void ShipComponentDataBooster::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataBooster::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.h index b18c58b3..68f9d376 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.h @@ -29,7 +29,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataBooster (const ShipComponentDataBooster & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.cpp index ed6bd626..fb73642a 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.cpp @@ -89,7 +89,7 @@ void ShipComponentDataBridge::printDebugString (Unicode::String & result, U //---------------------------------------------------------------------- -void ShipComponentDataBridge::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataBridge::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.h index e8991bea..5de642e2 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.h @@ -29,7 +29,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataBridge (const ShipComponentDataBridge & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.cpp index 7af75191..30391403 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.cpp @@ -122,7 +122,7 @@ void ShipComponentDataCapacitor::printDebugString (Unicode::String & result //---------------------------------------------------------------------- -void ShipComponentDataCapacitor::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataCapacitor::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.h index e84c1660..181e20fa 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.h @@ -28,7 +28,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataCapacitor (const ShipComponentDataCapacitor & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp index bf76572c..0218e344 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp @@ -87,11 +87,11 @@ bool ShipComponentDataCargoHold::readDataFromComponent (TangibleObject const & c //-- read contents { - stdvector::fwd types; + std::vector types; if (objvars.getItem(Objvars::cargoHoldContentsTypes, types)) { - stdvector::fwd amounts; + std::vector amounts; if (!objvars.getItem(Objvars::cargoHoldContentsAmounts, amounts)) WARNING (true, ("ShipComponentDataCargoHold [%s] has no cargoHoldContentsAmounts [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::cargoHoldContentsAmounts.c_str ())); else if (amounts.size() != types.size()) @@ -123,8 +123,8 @@ void ShipComponentDataCargoHold::writeDataToComponent (TangibleObject & compone //-- write contents { - stdvector::fwd types; - stdvector::fwd amounts; + std::vector types; + std::vector amounts; types.reserve(m_cargoHoldContents.size()); amounts.reserve(m_cargoHoldContents.size()); @@ -174,7 +174,7 @@ void ShipComponentDataCargoHold::printDebugString (Unicode::String & result //---------------------------------------------------------------------- -void ShipComponentDataCargoHold::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataCargoHold::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.h index c867a11d..545cedb5 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.h @@ -30,7 +30,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataCargoHold (const ShipComponentDataCargoHold & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.cpp index e87788f9..4a769564 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.cpp @@ -105,7 +105,7 @@ void ShipComponentDataDroidInterface::printDebugString (Unicode::String & r //---------------------------------------------------------------------- -void ShipComponentDataDroidInterface::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataDroidInterface::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.h index cc629fc4..73a4e357 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.h @@ -28,7 +28,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataDroidInterface (const ShipComponentDataDroidInterface & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.cpp index f430a66d..d571626e 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.cpp @@ -225,7 +225,7 @@ void ShipComponentDataEngine::printDebugString (Unicode::String & result, U //---------------------------------------------------------------------- -void ShipComponentDataEngine::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataEngine::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.h index 8af59377..2b8b0116 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.h @@ -29,7 +29,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataEngine (const ShipComponentDataEngine & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.cpp index bb03777f..dae95dc2 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.cpp @@ -89,7 +89,7 @@ void ShipComponentDataHangar::printDebugString (Unicode::String & result, U //---------------------------------------------------------------------- -void ShipComponentDataHangar::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataHangar::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.h index c7f9a882..ab67b815 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.h @@ -28,7 +28,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataHangar (const ShipComponentDataHangar & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.cpp index 73e600df..02c45291 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.cpp @@ -82,7 +82,7 @@ void ShipComponentDataModification::printDebugString (Unicode::String & res //---------------------------------------------------------------------- -void ShipComponentDataModification::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataModification::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.h index 4009e7e9..de38a6af 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.h @@ -29,7 +29,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataModification (const ShipComponentDataModification & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.cpp index d725ca61..00cfaad8 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.cpp @@ -103,7 +103,7 @@ void ShipComponentDataReactor::printDebugString (Unicode::String & result, //---------------------------------------------------------------------- -void ShipComponentDataReactor::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataReactor::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.h index 84777368..1ddc25ee 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.h @@ -28,7 +28,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataReactor (const ShipComponentDataReactor & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.cpp index 16808ed2..3bbb29ea 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.cpp @@ -143,7 +143,7 @@ void ShipComponentDataShield::printDebugString (Unicode::String & result, U //---------------------------------------------------------------------- -void ShipComponentDataShield::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataShield::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.h index 559c3af1..e09b61e5 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.h @@ -28,7 +28,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataShield (const ShipComponentDataShield & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.cpp index 2a7daf71..1f76ed56 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.cpp @@ -89,7 +89,7 @@ void ShipComponentDataTargetingStation::printDebugString (Unicode::String & //---------------------------------------------------------------------- -void ShipComponentDataTargetingStation::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataTargetingStation::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); } diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.h index a8440e8b..4a267404 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.h @@ -28,7 +28,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataTargetingStation (const ShipComponentDataTargetingStation & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.cpp index aeb4c25c..fc0dd86f 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.cpp @@ -184,7 +184,7 @@ void ShipComponentDataWeapon::printDebugString (Unicode::String & result, U //---------------------------------------------------------------------- -void ShipComponentDataWeapon::getAttributes(stdvector >::fwd & data) const +void ShipComponentDataWeapon::getAttributes(std::vector > & data) const { ServerShipComponentData::getAttributes(data); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.h index bb5f5d71..fb09ac15 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.h +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.h @@ -29,7 +29,7 @@ public: virtual void printDebugString (Unicode::String & result, Unicode::String const & padding) const; - virtual void getAttributes (stdvector >::fwd & data) const; + virtual void getAttributes (std::vector > & data) const; private: ShipComponentDataWeapon (const ShipComponentDataWeapon & rhs); diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp index 475b2504..7e5e4c11 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp @@ -23,7 +23,7 @@ namespace ShipInternalDamageOverTimeManagerNamespace { typedef ShipInternalDamageOverTimeManager::IdotVector IdotVector; typedef std::pair IdotDamage; - typedef stdvector::fwd IdotDamageVector; + typedef std::vector IdotDamageVector; IdotVector s_idotVector; IdotVector s_temporaryIdotVector; diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.h b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.h index 50c2183c..ac1aa00f 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.h +++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.h @@ -19,7 +19,7 @@ class ShipInternalDamageOverTimeManager { public: - typedef stdvector::fwd IdotVector; + typedef std::vector IdotVector; static void install(); static void remove(); diff --git a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.h b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.h index 746c145e..f6c0508f 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.h +++ b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.h @@ -17,7 +17,7 @@ class SpaceDockingManager { public: - typedef stdlist::fwd HardPointList; + typedef std::list HardPointList; static void install(); diff --git a/engine/server/library/serverGame/src/shared/space/SpacePath.h b/engine/server/library/serverGame/src/shared/space/SpacePath.h index 3dbc2e65..8ac707c1 100755 --- a/engine/server/library/serverGame/src/shared/space/SpacePath.h +++ b/engine/server/library/serverGame/src/shared/space/SpacePath.h @@ -17,7 +17,7 @@ class SpacePath public: friend class SpacePathManager; - typedef stdvector::fwd TransformList; + typedef std::vector TransformList; void addTransform(Transform const & transform); TransformList const & getTransformList() const; @@ -48,7 +48,7 @@ private: float m_collisionRadius; - typedef stdmultimap::fwd ObjectSizeMap; + typedef std::multimap ObjectSizeMap; ObjectSizeMap * const m_collisionRadiusMap; void addReference(void const * const object, float const objectSize); diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquad.h b/engine/server/library/serverGame/src/shared/space/SpaceSquad.h index 672afa88..5fd76ddb 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceSquad.h +++ b/engine/server/library/serverGame/src/shared/space/SpaceSquad.h @@ -25,7 +25,7 @@ friend class SpaceSquadManager; public: - typedef stdset::fwd SpaceSquadList; + typedef std::set SpaceSquadList; static void install(); @@ -84,7 +84,7 @@ private: void verifyAttackSquads(); #endif // _DEBUG - typedef stdlist::fwd AttackSquadList; + typedef std::list AttackSquadList; SpaceSquad * m_guardTarget; SpaceSquadList * const m_guardedByList; diff --git a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp index 70f5bbef..0c0a3b7c 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp @@ -372,7 +372,7 @@ Node &SpaceVisibilityManager_namespace::getNode(const NodeId &location) // ---------------------------------------------------------------------- -void SpaceVisibilityManager::getObjectsVisibleFromLocation(const Vector & location, stdvector::fwd &results) +void SpaceVisibilityManager::getObjectsVisibleFromLocation(const Vector & location, std::vector &results) { const Node &theNode = getNode(NodeId(location)); theNode.getAllVisibleObjects(results); diff --git a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.h b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.h index 32185c8b..73668d87 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.h +++ b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.h @@ -26,8 +26,8 @@ class SpaceVisibilityManager static void moveObject (const ServerObject & object); static void removeObject (ServerObject & object); - static void getObjectsVisibleFromLocation (const Vector & location, stdvector::fwd &results); - static void getClientsInRange (const Vector &location, float radius, stdset::fwd &results); + static void getObjectsVisibleFromLocation (const Vector & location, std::vector &results); + static void getClientsInRange (const Vector &location, float radius, std::set &results); }; diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.h b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.h index cd089e4d..03d4e1e1 100755 --- a/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.h +++ b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.h @@ -21,13 +21,13 @@ public: explicit InstallationSynchronizedUi(InstallationObject &); ~InstallationSynchronizedUi(); - typedef stdvector::fwd ResourceDataVector; - typedef stdvector::fwd ResourcePoolVector; - typedef stdvector::fwd ResourceTypeIdVector; - typedef stdvector::fwd ResourceTypeNameVector; - typedef stdvector::fwd ResourceTypeParentVector; + typedef std::vector ResourceDataVector; + typedef std::vector ResourcePoolVector; + typedef std::vector ResourceTypeIdVector; + typedef std::vector ResourceTypeNameVector; + typedef std::vector ResourceTypeParentVector; typedef std::pair HopperContentElement; - typedef stdvector::fwd HopperContentsVector; + typedef std::vector HopperContentsVector; void getResourceData (ResourceDataVector & data); diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.h b/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.h index ddaa4d59..b33cce1d 100755 --- a/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.h +++ b/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.h @@ -36,7 +36,7 @@ public: void sendDeltas() const; int getNumClients () const; - const stdvector::fwd & getClients() const; + const std::vector & getClients() const; ServerObject * getOwner (); const ServerObject * getOwner () const; @@ -54,7 +54,7 @@ private: void sendBaselinesToClient(const Client& client) const; - stdvector::fwd * m_clientObjects; + std::vector * m_clientObjects; ServerObject* m_owner; mutable bool m_ownerChangingAuthority; Archive::AutoDeltaByteStream m_uiPackage; diff --git a/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.h b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.h index 9ec22759..59fecf95 100755 --- a/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.h +++ b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.h @@ -52,13 +52,13 @@ private: int m_id; CreatureObject* m_initiator; - stdvector >::fwd* m_initiatorContents; + std::vector >* m_initiatorContents; int m_initiatorMoney; bool m_initiatorOk; bool m_initiatorVerify; CreatureObject* m_recipient; - stdvector >::fwd* m_recipientContents; + std::vector >* m_recipientContents; int m_recipientMoney; bool m_recipientOk; bool m_recipientVerify; diff --git a/engine/server/library/serverNetworkMessages/src/shared/AvatarList.h b/engine/server/library/serverNetworkMessages/src/shared/AvatarList.h index 41e8883d..204161ee 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/AvatarList.h +++ b/engine/server/library/serverNetworkMessages/src/shared/AvatarList.h @@ -29,7 +29,7 @@ struct AvatarRecord // ====================================================================== -typedef stdvector::fwd AvatarList; +typedef std::vector AvatarList; // ====================================================================== diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h index c5aa8de5..86f0ab9a 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h @@ -44,7 +44,7 @@ public: public: MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::string &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime); - MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const stdvector::fwd &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime); + MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::vector &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime); MessageToPayload(MessageToPayload const & rhs); MessageToPayload(); ~MessageToPayload(); @@ -66,7 +66,7 @@ public: NetworkId const &getNetworkId() const; MessageToId const &getMessageId() const; std::string const &getMethod() const; - stdvector::fwd const &getPackedDataVector() const; + std::vector const &getPackedDataVector() const; std::string getDataAsString() const; unsigned long getCallTime() const; bool getGuaranteed() const; diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h index d9594c6a..98754843 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h @@ -26,7 +26,7 @@ class MessageToPayloadImpl { public: MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::string &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime); - MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const stdvector::fwd &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime); + MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::vector &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime); MessageToPayloadImpl(); ~MessageToPayloadImpl(); diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp index bf68895b..91c93dc8 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp @@ -10,7 +10,7 @@ // ====================================================================== -AddResourceTypeMessage::AddResourceTypeMessage(stdvector::fwd const &data) : +AddResourceTypeMessage::AddResourceTypeMessage(std::vector const &data) : GameNetworkMessage("AddResourceTypeMessage"), m_data() { diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h index 4758c08c..e13d5acf 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h @@ -39,11 +39,11 @@ namespace AddResourceTypeMessageNamespace class AddResourceTypeMessage : public GameNetworkMessage { public: - AddResourceTypeMessage (stdvector::fwd const &data); + AddResourceTypeMessage (std::vector const &data); AddResourceTypeMessage (Archive::ReadIterator & source); ~AddResourceTypeMessage (); - stdvector::fwd const & getData() const; + std::vector const & getData() const; private: Archive::AutoArray m_data; diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h index a096766f..a693698b 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h @@ -21,7 +21,7 @@ class CharacterNamesMessage : public GameNetworkMessage { public: - CharacterNamesMessage(const stdvector::fwd &ids, const stdvector::fwd &stationIds, const stdvector::fwd &characterNames, const stdvector::fwd &characterFullNames, const stdvector::fwd &createTimes, const stdvector::fwd &loginTimes); + CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); CharacterNamesMessage(Archive::ReadIterator & source); ~CharacterNamesMessage(); diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp index 8fd0d13f..81378442 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp @@ -11,7 +11,7 @@ // ====================================================================== -CreateGroupMessage::CreateGroupMessage(GroupMemberParam const & leader, stdvector::fwd const & members) : +CreateGroupMessage::CreateGroupMessage(GroupMemberParam const & leader, std::vector const & members) : GameNetworkMessage("CreateGroupMessage"), m_leader(leader), m_members(members) diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h index 127691ce..bfc9e082 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h @@ -20,19 +20,19 @@ class CreateGroupMessage: public GameNetworkMessage { public: - CreateGroupMessage(GroupMemberParam const &leader, stdvector::fwd const & members); + CreateGroupMessage(GroupMemberParam const &leader, std::vector const & members); CreateGroupMessage(Archive::ReadIterator &source); ~CreateGroupMessage(); GroupMemberParam const & getLeader() const; - stdvector::fwd const & getMembers() const; + std::vector const & getMembers() const; private: CreateGroupMessage(CreateGroupMessage const &); CreateGroupMessage &operator=(CreateGroupMessage const &); Archive::AutoVariable m_leader; - Archive::AutoVariable::fwd > m_members; + Archive::AutoVariable > m_members; }; // ---------------------------------------------------------------------- @@ -44,7 +44,7 @@ inline GroupMemberParam const &CreateGroupMessage::getLeader() const // ---------------------------------------------------------------------- -inline stdvector::fwd const &CreateGroupMessage::getMembers() const +inline std::vector const &CreateGroupMessage::getMembers() const { return m_members.get(); } diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h index 7a1d475e..78dacae5 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h @@ -21,13 +21,13 @@ class CreateSyncUiMessage : public GameNetworkMessage { public: - CreateSyncUiMessage (const NetworkId& id, const stdvector::fwd & clients); + CreateSyncUiMessage (const NetworkId& id, const std::vector & clients); CreateSyncUiMessage (Archive::ReadIterator & source); ~CreateSyncUiMessage (); public: const NetworkId& getId(void) const; - const stdvector::fwd & getClients() const; + const std::vector & getClients() const; private: Archive::AutoVariable m_id; // id of the object @@ -47,7 +47,7 @@ inline const NetworkId& CreateSyncUiMessage::getId(void) const //----------------------------------------------------------------------- -inline const stdvector::fwd & CreateSyncUiMessage::getClients() const +inline const std::vector & CreateSyncUiMessage::getClients() const { return m_clients.get(); } diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp index ff451d49..e58c7883 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp @@ -10,7 +10,7 @@ // ====================================================================== -GetMoneyFromOfflineObjectMessage::GetMoneyFromOfflineObjectMessage(NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector::fwd const & packedDictionary, bool success) : +GetMoneyFromOfflineObjectMessage::GetMoneyFromOfflineObjectMessage(NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, std::vector const & packedDictionary, bool success) : GameNetworkMessage("GetMoneyFromOfflineObjectMessage"), m_sourceObject(sourceObject), m_amount(amount), diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h index f1e8e732..d0a27342 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h @@ -28,7 +28,7 @@ class GetMoneyFromOfflineObjectMessage : public GameNetworkMessage { public: - GetMoneyFromOfflineObjectMessage (NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector::fwd const & packedDictionary, bool success); + GetMoneyFromOfflineObjectMessage (NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, std::vector const & packedDictionary, bool success); GetMoneyFromOfflineObjectMessage (Archive::ReadIterator & source); ~GetMoneyFromOfflineObjectMessage (); @@ -38,7 +38,7 @@ class GetMoneyFromOfflineObjectMessage : public GameNetworkMessage NetworkId const & getReplyTo() const; std::string const & getSuccessCallback() const; std::string const & getFailCallback() const; - stdvector::fwd const & getPackedDictionary() const; + std::vector const & getPackedDictionary() const; bool getSuccess() const; private: diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h index 1ccd61e2..a7aeb0a4 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h @@ -35,7 +35,7 @@ public: int m_intParam2; }; - typedef stdvector::fwd PvpCommands; + typedef std::vector PvpCommands; void addPvpCommand(uint32 command, NetworkId const &idParam, int intParam1, int intParam2); PvpCommands const & getPvpCommands() const; diff --git a/engine/server/library/serverPathfinding/src/shared/CityPathGraph.h b/engine/server/library/serverPathfinding/src/shared/CityPathGraph.h index d39dae83..322f653c 100755 --- a/engine/server/library/serverPathfinding/src/shared/CityPathGraph.h +++ b/engine/server/library/serverPathfinding/src/shared/CityPathGraph.h @@ -23,7 +23,7 @@ class SphereTree; typedef SphereTree PathNodeTree; -typedef stdvector::fwd BoxList; +typedef std::vector BoxList; // ====================================================================== // CityPathGraph is a DynamicPathGraph with some specializations that @@ -90,7 +90,7 @@ protected: PathNodeTree * m_nodeTree; //@todo: order the CityPathNodes below in such a way as to make searching for the closest one quick - stdmap::fwd >::fwd * m_namedNodes; + std::map > * m_namedNodes; int m_token; CachedNetworkId m_creatorId; diff --git a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp index 9194452e..b30832cb 100755 --- a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp +++ b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp @@ -1072,7 +1072,7 @@ bool CityPathGraphManager::reloadPathNodes ( void ) // ---------------------------------------------------------------------- -bool CityPathGraphManager::reloadPathNodes ( stdvector< ServerObject * >::fwd const & objects ) +bool CityPathGraphManager::reloadPathNodes ( std::vector< ServerObject * > const & objects ) { int objectCount = objects.size(); diff --git a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.h b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.h index bef09c61..6eef19a8 100755 --- a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.h +++ b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.h @@ -16,9 +16,9 @@ class CityPathGraph; class CityPathNode; class BuildingObject; -typedef stdmap< int, CityPathGraph * >::fwd CityGraphMap; +typedef std::map< int, CityPathGraph * > CityGraphMap; -typedef stdvector< Vector >::fwd PositionList; +typedef std::vector< Vector > PositionList; // ====================================================================== @@ -55,7 +55,7 @@ public: static bool destroyPathNodes ( ServerObject * building ); static bool reloadPathNodes ( void ); - static bool reloadPathNodes ( stdvector< ServerObject * >::fwd const & objects ); + static bool reloadPathNodes ( std::vector< ServerObject * > const & objects ); static bool markCityEntrance ( ServerObject * object ); static bool unmarkCityEntrance ( ServerObject * object ); diff --git a/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp b/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp index b4dc446b..06900e07 100755 --- a/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp +++ b/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp @@ -210,7 +210,7 @@ void PathAutoGenerator::pathAutoCleanup(Vector const & pos_w, Unicode::String & Vector const center((minX + maxX) * 0.5f, 0.0f, (minY + maxY) * 0.5f); - typedef stdvector::fwd ServerObjectVector; + typedef std::vector ServerObjectVector; ServerObjectVector sv; diff --git a/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.h b/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.h index ab9615f0..13c9b198 100755 --- a/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.h +++ b/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.h @@ -9,6 +9,9 @@ #ifndef INCLUDED_ServerPathBuilder_H #define INCLUDED_ServerPathBuilder_H +#include +#include + #include "serverGame/AiLocation.h" #include "Unicode.h" @@ -22,8 +25,8 @@ class PathSearch; class PathNode; class ServerObject; -typedef stdlist::fwd AiPath; -typedef stdvector::fwd IndexList; +typedef std::list AiPath; +typedef std::vector IndexList; // ====================================================================== diff --git a/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.h b/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.h index 1c351675..b876581b 100755 --- a/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.h +++ b/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.h @@ -69,7 +69,7 @@ protected: // ---------- - typedef stdset::fwd ClientList; + typedef std::set ClientList; ClientList * m_clientList; diff --git a/engine/server/library/serverScript/src/shared/GameScriptObject.h b/engine/server/library/serverScript/src/shared/GameScriptObject.h index 7e9a487e..94842fd9 100755 --- a/engine/server/library/serverScript/src/shared/GameScriptObject.h +++ b/engine/server/library/serverScript/src/shared/GameScriptObject.h @@ -55,7 +55,7 @@ struct ScriptData typedef std::vector ScriptList; typedef Unicode::String String_t; -typedef stdvector ::fwd StringVector_t; +typedef std::vector StringVector_t; // values returned from script functions enum @@ -135,7 +135,7 @@ public: static void makeScriptDictionary(const ScriptParams & params, ScriptDictionaryPtr & dictionary); bool handleMessage(const std::string &messageName, const ScriptDictionaryPtr & data); - bool handleMessage(const std::string &messageName, const stdvector::fwd & packedData); + bool handleMessage(const std::string &messageName, const std::vector & packedData); void onWatching(ServerObject & subject); void onStopWatching(ServerObject & subject); @@ -150,7 +150,7 @@ public: static void enableNewJediTracking(bool enableTracking); static int getScriptFreeMem(); - static stdset::fwd & getScriptFunctions(const std::string & script); + static std::set & getScriptFunctions(const std::string & script); static Scheduler & getScriptScheduler(); static void runOneScript( const std::string & scriptName, @@ -174,9 +174,9 @@ public: static void packAllScriptVarDeltas(); void clearScriptVars(); - void packScriptVars(stdvector::fwd & target) const; - void unpackScriptVars(const stdvector::fwd & data) const; - void unpackDeltaScriptVars(const stdvector::fwd & source) const; + void packScriptVars(std::vector & target) const; + void unpackScriptVars(const std::vector & data) const; + void unpackDeltaScriptVars(const std::vector & source) const; static ScriptListEntry getScriptListEntry(std::string const &scriptName); @@ -238,7 +238,7 @@ inline const ScriptList & GameScriptObject::getScripts(void) const return m_scriptList; } -inline stdset::fwd & GameScriptObject::getScriptFunctions(const std::string & script) +inline std::set & GameScriptObject::getScriptFunctions(const std::string & script) { return (*ms_scriptDataMap)[script].functions; } diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index b2b3b8ab..75f83e68 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -5483,7 +5483,7 @@ namespace ScriptConversion { return true; } - const bool convert(const jobjectArray & source, stdvector::fwd & target) + const bool convert(const jobjectArray & source, std::vector & target) { JNIEnv * env = JavaLibrary::getEnv(); if (!env || !source) diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.h b/engine/server/library/serverScript/src/shared/JavaLibrary.h index 5029f0e3..d1ea2354 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.h +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.h @@ -68,8 +68,8 @@ namespace Archive typedef std::vector ScriptList; typedef Unicode::String String_t; -typedef stdvector ::fwd StringVector_t; -typedef stdvector::fwd MenuDataVector; +typedef std::vector StringVector_t; +typedef std::vector MenuDataVector; //======================================================================== // C<->Java conversion functions @@ -79,20 +79,20 @@ namespace ScriptConversion { const bool convert(const Location & sourceLoc, LocalRefPtr & target); const bool convert(const LocalRefParam & sourceLoc, Location & target); - const bool convert(const LocalObjectArrayRefParam & sourceLoc, stdvector::fwd & target); - const bool convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & target); + const bool convert(const LocalObjectArrayRefParam & sourceLoc, std::vector & target); + const bool convert(const std::vector & source, LocalObjectArrayRefPtr & target); const bool convert(const jobject source, StringId & target); const bool convert(const LocalRefParam & source, StringId & target); const bool convert(const StringId & source, LocalRefPtr & target); const bool getClassName(const jobject & source, std::string & target); - const bool convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & strArray); - const bool convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & strArray); - const bool convert(const jobjectArray & source, stdvector::fwd & strArray); - const bool convert(const stdset::fwd & source, LocalObjectArrayRefPtr & strArray); - const bool convert(const stdvector::fwd & source, LocalLongArrayRefPtr & target); - const bool convert(const stdvector::fwd & source, LocalLongArrayRefPtr & target); - const bool convert(const jlongArray & source, stdvector::fwd & target); - const bool convert(const jlongArray & source, stdvector::fwd & target); + const bool convert(const std::vector & source, LocalObjectArrayRefPtr & strArray); + const bool convert(const std::vector & source, LocalObjectArrayRefPtr & strArray); + const bool convert(const jobjectArray & source, std::vector & strArray); + const bool convert(const std::set & source, LocalObjectArrayRefPtr & strArray); + const bool convert(const std::vector & source, LocalLongArrayRefPtr & target); + const bool convert(const std::vector & source, LocalLongArrayRefPtr & target); + const bool convert(const jlongArray & source, std::vector & target); + const bool convert(const jlongArray & source, std::vector & target); const bool convert(const jobject & source, Vector & target, NetworkId & targetCell); const bool convertWorld(const jobject & source, Vector & target); const bool convertWorld(const jlong & source, Vector & target); @@ -101,16 +101,16 @@ namespace ScriptConversion const bool convert(const jobject & source, Vector & targetLoc, std::string & targetSceneId, NetworkId & targetCell); const bool convertWorld(const jobject & source, Vector & targetLoc, std::string & targetSceneId); const bool convert(const Vector & sourceLoc, const std::string & sourceSceneId, const NetworkId & sourceCell, LocalRefPtr & target); - const bool convertWorld(const jobjectArray & source, stdvector::fwd & target); - const bool convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & target); + const bool convertWorld(const jobjectArray & source, std::vector & target); + const bool convert(const std::vector & source, LocalObjectArrayRefPtr & target); const bool convert(const LocalRefParam & source, const Region * & target); const bool convert(const jobject & source, const Region * & target); const bool convert(const Region & source, LocalRefPtr & target); const bool convert(const AttribMod::AttribMod & source, LocalRefPtr & target); const bool convert(const jobject & source, AttribMod::AttribMod & target); const bool convert(const LocalRefParam & source, AttribMod::AttribMod & target); - const bool convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & target); - const bool convert(const jobjectArray & source, stdvector::fwd & target); + const bool convert(const std::vector & source, LocalObjectArrayRefPtr & target); + const bool convert(const jobjectArray & source, std::vector & target); const bool convert(const jobject & source, Vector & target, NetworkId & targetCell, const Vector & i_default); const bool convert(const jbyteArray & source, std::vector & target); const bool convert(const LocalByteArrayRef & source, std::vector & target); @@ -134,16 +134,16 @@ class JavaLibrary // friend jobject convertDynamicVariableListToObject(JNIEnv *env, const DynamicVariableList& list); friend const bool ScriptConversion::convert(const Location & sourceLoc, LocalRefPtr & target); friend const bool ScriptConversion::convert(const LocalRefParam & sourceLoc, Location & target); - friend const bool ScriptConversion::convert(const LocalObjectArrayRefParam & sourceLoc, stdvector::fwd & target); - friend const bool ScriptConversion::convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & target); + friend const bool ScriptConversion::convert(const LocalObjectArrayRefParam & sourceLoc, std::vector & target); + friend const bool ScriptConversion::convert(const std::vector & source, LocalObjectArrayRefPtr & target); friend const bool ScriptConversion::convert(const jobject source, StringId & target); friend const bool ScriptConversion::convert(const LocalRefParam & source, StringId & target); friend const bool ScriptConversion::convert(const StringId & source, LocalRefPtr & target); - friend const bool ScriptConversion::convert(const stdvector::fwd & source, LocalLongArrayRefPtr & target); - friend const bool ScriptConversion::convert(const stdvector::fwd & source, LocalLongArrayRefPtr & target); - friend const bool ScriptConversion::convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & strArray); - friend const bool ScriptConversion::convert(const jlongArray & source, stdvector::fwd & target); - friend const bool ScriptConversion::convert(const jlongArray & source, stdvector::fwd & target); + friend const bool ScriptConversion::convert(const std::vector & source, LocalLongArrayRefPtr & target); + friend const bool ScriptConversion::convert(const std::vector & source, LocalLongArrayRefPtr & target); + friend const bool ScriptConversion::convert(const std::vector & source, LocalObjectArrayRefPtr & strArray); + friend const bool ScriptConversion::convert(const jlongArray & source, std::vector & target); + friend const bool ScriptConversion::convert(const jlongArray & source, std::vector & target); friend const bool ScriptConversion::convert(const jobject & source, Vector & target, NetworkId & targetCell); friend const bool ScriptConversion::convertWorld(const jobject & source, Vector & target); friend const bool ScriptConversion::convertWorld(const jlong & source, Vector & target); @@ -152,18 +152,18 @@ class JavaLibrary friend const bool ScriptConversion::convert(const jobject & source, Vector & targetLoc, std::string & targetSceneId, NetworkId & targetCell); friend const bool ScriptConversion::convertWorld(const jobject & source, Vector & targetLoc, std::string & targetSceneId); friend const bool ScriptConversion::convert(const Vector & sourceLoc, const std::string & sourceSceneId, const NetworkId & sourceCell, LocalRefPtr & target); - friend const bool ScriptConversion::convertWorld(const jobjectArray & source, stdvector::fwd & target); - friend const bool ScriptConversion::convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & target); + friend const bool ScriptConversion::convertWorld(const jobjectArray & source, std::vector & target); + friend const bool ScriptConversion::convert(const std::vector & source, LocalObjectArrayRefPtr & target); friend const bool ScriptConversion::convert(const jobject & source, const Region* &target); friend const bool ScriptConversion::convert(const Region & source, LocalRefPtr & target); - friend const bool ScriptConversion::convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & strArray); - friend const bool ScriptConversion::convert(const jobjectArray & source, stdvector::fwd & strArray); - friend const bool ScriptConversion::convert(const stdset::fwd & source, LocalObjectArrayRefPtr & strArray); + friend const bool ScriptConversion::convert(const std::vector & source, LocalObjectArrayRefPtr & strArray); + friend const bool ScriptConversion::convert(const jobjectArray & source, std::vector & strArray); + friend const bool ScriptConversion::convert(const std::set & source, LocalObjectArrayRefPtr & strArray); friend const bool ScriptConversion::convert(const AttribMod::AttribMod & source, LocalRefPtr & target); friend const bool ScriptConversion::convert(const jobject & source, AttribMod::AttribMod & target); friend const bool ScriptConversion::convert(const LocalRefParam & source, AttribMod::AttribMod & target); - friend const bool ScriptConversion::convert(const stdvector::fwd & source, LocalObjectArrayRefPtr & target); - friend const bool ScriptConversion::convert(const jobjectArray & source, stdvector::fwd & target); + friend const bool ScriptConversion::convert(const std::vector & source, LocalObjectArrayRefPtr & target); + friend const bool ScriptConversion::convert(const jobjectArray & source, std::vector & target); friend const bool ScriptConversion::convert(const jbyteArray & source, std::vector & target); friend const bool ScriptConversion::convert(const LocalByteArrayRef & source, std::vector & target); friend const bool ScriptConversion::convert(const std::vector & source, LocalByteArrayRefPtr & target); @@ -221,9 +221,9 @@ public: static void setScriptVar(const ServerObject &object, const std::string & name, float value); static void setScriptVar(const ServerObject &object, const std::string & name, const std::string & value); static void clearScriptVars(const ServerObject & source); - static void unpackScriptVars(const ServerObject & target, const stdvector::fwd & data); - static void unpackDeltaScriptVars(const ServerObject & target, const stdvector::fwd & data); - static void packScriptVars(const ServerObject & source, stdvector::fwd & data); + static void unpackScriptVars(const ServerObject & target, const std::vector & data); + static void unpackDeltaScriptVars(const ServerObject & target, const std::vector & data); + static void packScriptVars(const ServerObject & source, std::vector & data); static void packAllDeltaScriptVars(); // accessor functions @@ -309,13 +309,13 @@ public: static const bool convert(const JavaStringParam & source, std::string & target); static const bool convert(const Unicode::String & source, JavaString & target); static const bool convert(const JavaStringParam & source, Unicode::String & target); - static const bool convert(const JavaDictionary & source, stdvector::fwd & target); + static const bool convert(const JavaDictionary & source, std::vector & target); static const bool convert(const LocalRefParamPtr & source, MenuDataVector & target); static const bool convert(const MenuDataVector & source, LocalRefParamPtr & target); - static const bool convert(const stdmap::fwd & source, JavaDictionaryPtr & target); - static const bool convert(const stdvector >::fwd & source, JavaDictionaryPtr & target); - static const bool convert(const stdvector > >::fwd & source, JavaDictionaryPtr & target); - static const bool convert(const stdvector >::fwd & source, JavaDictionaryPtr & target); + static const bool convert(const std::map & source, JavaDictionaryPtr & target); + static const bool convert(const std::vector > & source, JavaDictionaryPtr & target); + static const bool convert(const std::vector > > & source, JavaDictionaryPtr & target); + static const bool convert(const std::vector > & source, JavaDictionaryPtr & target); static LocalRefPtr convert(const ValueDictionary & source); static void convert(const jobject & source, ValueDictionary & target); @@ -332,8 +332,8 @@ public: // message functions int callMessages(const NetworkId & caller, const std::string & method, const ScriptDictionaryPtr & data); int callMessage(const NetworkId & caller, const std::string & script, const std::string & method, const ScriptDictionary & data); - void packDictionary(const ScriptDictionary & dictionary, stdvector::fwd & packedData); - bool unpackDictionary(const stdvector::fwd & packedData, ScriptDictionaryPtr & dictionary); + void packDictionary(const ScriptDictionary & dictionary, std::vector & packedData); + bool unpackDictionary(const std::vector & packedData, ScriptDictionaryPtr & dictionary); void convert(const ScriptParams & params, JavaDictionaryPtr & dictionary); static void setupWeaponCombatData(JNIEnv *env, const WeaponObject * weapon, jobject weaponData); diff --git a/engine/server/library/serverScript/src/shared/ScriptDictionary.h b/engine/server/library/serverScript/src/shared/ScriptDictionary.h index 4a547d34..dbab4ed3 100755 --- a/engine/server/library/serverScript/src/shared/ScriptDictionary.h +++ b/engine/server/library/serverScript/src/shared/ScriptDictionary.h @@ -27,7 +27,7 @@ public: virtual void serialize(void) = 0; - const stdvector::fwd & getSerializedData(void) const; + const std::vector & getSerializedData(void) const; uint32 getCrc(void) const; protected: @@ -35,7 +35,7 @@ protected: ScriptDictionary(void); - stdvector::fwd m_serializedData; + std::vector m_serializedData; uint32 m_crc; private: @@ -53,7 +53,7 @@ inline ScriptDictionary::~ScriptDictionary() { } -inline const stdvector::fwd & ScriptDictionary::getSerializedData(void) const +inline const std::vector & ScriptDictionary::getSerializedData(void) const { return m_serializedData; } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp index c9d0cbfc..cd9c3269 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp @@ -392,7 +392,7 @@ void JNICALL ScriptMethodsNewbieTutorialNamespace::newbieTutorialSendStartingLoc //-- Build the list for the client in order. Mark them unavailable when we've reached the minimum and the population is too high. typedef std::pair LocationStatus; - typedef stdvector::fwd LocationStatusVector; + typedef std::vector LocationStatusVector; LocationStatusVector clientLocations; clientLocations.reserve (ldv.size ()); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp index 7f2edf89..531c0048 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp @@ -68,7 +68,7 @@ static const std::string THEATER_FLATTEN_LAYER("terrain/poi_small.lay"); namespace ScriptMethodsObjectCreateNamespace { bool install(); - jlong createTheater(const stdvector::fwd & crcs, const stdvector::fwd & positions, const stdvector::fwd & headings, const std::vector & scripts, const Vector & center, const std::string & script, const NetworkId & creator, const std::string & name, int locationType); + jlong createTheater(const std::vector & crcs, const std::vector & positions, const std::vector & headings, const std::vector & scripts, const Vector & center, const std::string & script, const NetworkId & creator, const std::string & name, int locationType); jlong JNICALL createNewObjectAt(JNIEnv *env, jobject self, jstring source, jlong target); jlong JNICALL createNewObjectInWorld(JNIEnv *env, jobject self, jlong source, jobject location); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp index 5e9aea1d..3a78cfce 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp @@ -72,8 +72,8 @@ using namespace JNIWrappersNamespace; namespace ScriptMethodsObjectInfoNamespace { bool install(); - void getGoodItemsFromContainer(const Container & container, stdvector::fwd & goodItems); - jobjectArray getNamesFromCrcs(JNIEnv *env, const stdvector::fwd & templateCrcs); + void getGoodItemsFromContainer(const Container & container, std::vector & goodItems); + jobjectArray getNamesFromCrcs(JNIEnv *env, const std::vector & templateCrcs); LocalRefPtr createCustomVar(const jlong &objId, const std::string &variablePathName, CustomizationVariable &variable); LocalRefPtr createRangedIntCustomVar(const jlong &objId, const std::string &variablePathName, RangedIntCustomizationVariable &rangedIntVariable); LocalRefPtr createPalcolorCustomVar(const jlong &objId, const std::string &variablePathName, PaletteColorCustomizationVariable &variable); diff --git a/engine/server/library/serverScript/src/shared/ScriptParameters.h b/engine/server/library/serverScript/src/shared/ScriptParameters.h index ab7468f2..c022fbc5 100755 --- a/engine/server/library/serverScript/src/shared/ScriptParameters.h +++ b/engine/server/library/serverScript/src/shared/ScriptParameters.h @@ -27,7 +27,7 @@ namespace Crafting struct IngredientSlot; } -typedef stdvector::fwd MenuDataVector; +typedef std::vector MenuDataVector; struct SlotData { @@ -78,33 +78,33 @@ struct Param union { bool bParam; - const stddeque::fwd * baParam; + const std::deque * baParam; int iParam; - const stdvector::fwd * iaParam; + const std::vector * iaParam; float fParam; - const stdvector::fwd * faParam; + const std::vector * faParam; const char * sParam; - stdvector::fwd *saParam; + std::vector *saParam; const Unicode::String * uParam; - stdvector::fwd * uaParam; + std::vector * uaParam; const NetworkId * oidParam; - const stdvector::fwd *oidaParam; - const stdvector::fwd *coidaParam; - const stdvector::fwd *>::fwd *oidaaParam; + const std::vector *oidaParam; + const std::vector *coidaParam; + const std::vector *> *oidaaParam; const StringId * sidParam; - const stdvector::fwd *sidaParam; + const std::vector *sidaParam; const AttribMod::AttribMod * amParam; - const stdvector::fwd * amaParam; + const std::vector * amaParam; const ServerObjectTemplate::MentalStateMod * msmParam; - const stdvector::fwd * amsmParam; + const std::vector * amsmParam; const MenuDataVector * aomrdParam; const ManufactureObjectInterface * msoParam; const Vector * lParam; - const stdvector::fwd * laParam; + const std::vector * laParam; SlotData isParam; const ValueDictionary * valueDictionaryParam; - const stdvector::fwd * valueDictionaryArrayParam; - const stdvector::fwd * byteArrayParam; + const std::vector * valueDictionaryArrayParam; + const std::vector * byteArrayParam; } m_param; }; @@ -115,8 +115,8 @@ namespace Archive class ReadIterator; void get(ReadIterator & source, ScriptParams & target); void put(ByteStream & target, const ScriptParams & source); - void get(ReadIterator & source, stdvector::fwd *>::fwd & target); - void put(ByteStream & target, const stdvector::fwd *>::fwd & source); + void get(ReadIterator & source, std::vector *> & target); + void put(ByteStream & target, const std::vector *> & source); } class ScriptParams @@ -132,74 +132,74 @@ public: void addParam(const Unicode::unicode_char_t *, const std::string & paramName = "", bool owned = false); void addParam(bool param, const std::string & paramName = "", bool owned = false); - void addParam(const stddeque::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::deque & param, const std::string & paramName = "", bool owned = false); void addParam(int param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); void addParam(float param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); void addParam(const char * param, const std::string & paramName = "", bool owned = false); - void addParam(stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(std::vector & param, const std::string & paramName = "", bool owned = false); void addParam(const Unicode::String & param, const std::string & paramName = "", bool owned = false); - void addParam(stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(std::vector & param, const std::string & paramName = "", bool owned = false); void addParam(const NetworkId & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd *>::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector *> & param, const std::string & paramName = "", bool owned = false); void addParam(const StringId & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); // void addParam(SlotData param); // void addParam(const std::vector & param); void addParam(const AttribMod::AttribMod & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); void addParam(const ServerObjectTemplate::MentalStateMod & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); void addParam(const ManufactureObjectInterface & param, const std::string & paramName = "", bool owned = false); void addParam(const Crafting::IngredientSlot & param, const ManufactureObjectInterface & schematic, int amountRequired, const std::string & appearance, const std::string & paramName = "", bool owned = false); void addParam(const Vector &location, const std::string ¶mName = "", bool owned = false); - void addParam(const stdvector::fwd &location, const std::string ¶mName = "", bool owned = false); + void addParam(const std::vector &location, const std::string ¶mName = "", bool owned = false); void addParam(const ValueDictionary & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); void addParam(const MenuDataVector & param, const std::string & paramName = "", bool owned = false); - void addParam(const stdvector::fwd & param, const std::string & paramName = "", bool owned = false); + void addParam(const std::vector & param, const std::string & paramName = "", bool owned = false); bool changeParam(int index, int param, bool owned = false); - bool changeParam(int index, stdvector::fwd & param, bool owned = false); + bool changeParam(int index, std::vector & param, bool owned = false); bool changeParam(int index, float param, bool owned = false); bool changeParam(int index, const StringId & param, bool owned = false); bool changeParam(int index, const MenuDataVector & param, bool owned = false); - bool changeParam(int index, stdvector::fwd & param, bool owned = false); - bool changeParam(int index, stdvector::fwd & param, bool owned = false); - bool changeParam(int index, stdvector::fwd & param, bool owned = false); + bool changeParam(int index, std::vector & param, bool owned = false); + bool changeParam(int index, std::vector & param, bool owned = false); + bool changeParam(int index, std::vector & param, bool owned = false); - stdvector::fwd & getParams(); - const stdvector::fwd & getParams() const; + std::vector & getParams(); + const std::vector & getParams() const; int getParamCount(void) const; Param::ParamType getParamType(int index) const; const std::string & getParamName(int index) const; bool getBoolParam(int index) const; - const stddeque::fwd & getBoolArrayParam(int index) const; + const std::deque & getBoolArrayParam(int index) const; int getIntParam(int index) const; - const stdvector::fwd & getIntArrayParam(int index) const; + const std::vector & getIntArrayParam(int index) const; float getFloatParam(int index) const; - const stdvector::fwd & getFloatArrayParam(int index) const; + const std::vector & getFloatArrayParam(int index) const; const char * getStringParam(int index) const; - const stdvector::fwd & getStringArrayParam(int index) const; + const std::vector & getStringArrayParam(int index) const; const Unicode::String & getUnicodeParam(int index) const; - const stdvector::fwd & getUnicodeArrayParam(int index) const; + const std::vector & getUnicodeArrayParam(int index) const; const NetworkId & getObjIdParam(int index) const; - const stdvector::fwd & getObjIdArrayParam(int index) const; - const stdvector::fwd & getCachedObjIdArrayParam(int index) const; - const stdvector::fwd *>::fwd & getObjIdArrayArrayParam(int index) const; + const std::vector & getObjIdArrayParam(int index) const; + const std::vector & getCachedObjIdArrayParam(int index) const; + const std::vector *> & getObjIdArrayArrayParam(int index) const; const Vector & getLocationParam(int index) const; - const stdvector::fwd & getLocationArrayParam(int index) const; + const std::vector & getLocationArrayParam(int index) const; const StringId & getStringIdParam(int index) const; - const stdvector::fwd & getStringIdArrayParam(int index) const; + const std::vector & getStringIdArrayParam(int index) const; const AttribMod::AttribMod & getAttribModParam(int index) const; - const stdvector::fwd & getByteArrayParam(int index) const; - const stdvector::fwd & getAttribModArrayParam(int index) const; + const std::vector & getByteArrayParam(int index) const; + const std::vector & getAttribModArrayParam(int index) const; const ServerObjectTemplate::MentalStateMod & getMentalStateModParam(int index) const; - const stdvector::fwd & getMentalStateModArrayParam(int index) const; + const std::vector & getMentalStateModArrayParam(int index) const; const MenuDataVector & getObjectMenuRequestDataArrayParam(int index) const; const ManufactureObjectInterface & getManufactureSchematicParam(int index) const; const Crafting::IngredientSlot & getIngredientSlotParam(int index) const; @@ -207,14 +207,14 @@ public: int getIngredientSlotParamAmountRequired(int index) const; const std::string & getIngredientSlotParamAppearance(int index) const; const ValueDictionary & getValueDictionaryParam(int index) const; - const stdvector::fwd & getValueDictionaryArrayParam(int index) const; + const std::vector & getValueDictionaryArrayParam(int index) const; protected: friend void Archive::get(Archive::ReadIterator & source, ScriptParams & target); private: - stdvector::fwd m_params; + std::vector m_params; }; @@ -224,12 +224,12 @@ inline void ScriptParams::clear(void) m_params.clear(); } // ScriptParams::clear -inline stdvector::fwd & ScriptParams::getParams() +inline std::vector & ScriptParams::getParams() { return m_params; } -inline const stdvector::fwd & ScriptParams::getParams() const +inline const std::vector & ScriptParams::getParams() const { return m_params; } @@ -254,7 +254,7 @@ inline bool ScriptParams::getBoolParam(int index) const return m_params[index].m_param.bParam; } // ScriptParams::getBoolParam -inline const stddeque::fwd & ScriptParams::getBoolArrayParam(int index) const +inline const std::deque & ScriptParams::getBoolArrayParam(int index) const { return *m_params[index].m_param.baParam; } // ScriptParams::getBoolArrayParam @@ -264,7 +264,7 @@ inline int ScriptParams::getIntParam(int index) const return m_params[index].m_param.iParam; } // ScriptParams::getIntParam -inline const stdvector::fwd & ScriptParams::getIntArrayParam(int index) const +inline const std::vector & ScriptParams::getIntArrayParam(int index) const { return *m_params[index].m_param.iaParam; } // ScriptParams::getIntArrayParam @@ -274,7 +274,7 @@ inline float ScriptParams::getFloatParam(int index) const return m_params[index].m_param.fParam; } // ScriptParams::getFloatParam -inline const stdvector::fwd & ScriptParams::getFloatArrayParam(int index) const +inline const std::vector & ScriptParams::getFloatArrayParam(int index) const { return *m_params[index].m_param.faParam; } // ScriptParams::getFloatArrayParam @@ -284,7 +284,7 @@ inline const char * ScriptParams::getStringParam(int index) const return m_params[index].m_param.sParam; } // ScriptParams::getStringParam -inline const stdvector::fwd & ScriptParams::getStringArrayParam(int index) const +inline const std::vector & ScriptParams::getStringArrayParam(int index) const { return *m_params[index].m_param.saParam; } // ScriptParams::getStringArrayParam @@ -294,7 +294,7 @@ inline const Unicode::String & ScriptParams::getUnicodeParam(int index) const return *m_params[index].m_param.uParam; } // ScriptParams::getUnicodeParam -inline const stdvector::fwd & ScriptParams::getUnicodeArrayParam(int index) const +inline const std::vector & ScriptParams::getUnicodeArrayParam(int index) const { return *m_params[index].m_param.uaParam; } // ScriptParams::getUnicodeArrayParam @@ -304,7 +304,7 @@ inline const Vector &ScriptParams::getLocationParam(int index) const return *m_params[index].m_param.lParam; } // ScriptParams::getIntParam -inline const stdvector::fwd & ScriptParams::getLocationArrayParam(int index) const +inline const std::vector & ScriptParams::getLocationArrayParam(int index) const { return *m_params[index].m_param.laParam; } // ScriptParams::getIntArrayParam @@ -316,17 +316,17 @@ inline const NetworkId & ScriptParams::getObjIdParam(int index) const return NetworkId::cms_invalid; } // ScriptParams::getObjIdParam -inline const stdvector::fwd & ScriptParams::getObjIdArrayParam(int index) const +inline const std::vector & ScriptParams::getObjIdArrayParam(int index) const { return *m_params[index].m_param.oidaParam; } // ScriptParams::getObjIdArrayParam -inline const stdvector::fwd & ScriptParams::getCachedObjIdArrayParam(int index) const +inline const std::vector & ScriptParams::getCachedObjIdArrayParam(int index) const { return *m_params[index].m_param.coidaParam; } // ScriptParams::getCachedObjIdArrayParam -inline const stdvector::fwd *>::fwd & ScriptParams::getObjIdArrayArrayParam(int index) const +inline const std::vector *> & ScriptParams::getObjIdArrayArrayParam(int index) const { return *m_params[index].m_param.oidaaParam; } @@ -336,7 +336,7 @@ inline const StringId & ScriptParams::getStringIdParam(int index) const return *m_params[index].m_param.sidParam; } // ScriptParams::getStringIdParam -inline const stdvector::fwd & ScriptParams::getStringIdArrayParam(int index) const +inline const std::vector & ScriptParams::getStringIdArrayParam(int index) const { return *m_params[index].m_param.sidaParam; } // ScriptParams::getStringIdArrayParam @@ -346,7 +346,7 @@ inline const AttribMod::AttribMod & ScriptParams::getAttribModParam(int index) c return *m_params[index].m_param.amParam; } // ScriptParams::getAttribModParam -inline const stdvector::fwd & ScriptParams::getAttribModArrayParam(int index) const +inline const std::vector & ScriptParams::getAttribModArrayParam(int index) const { return *m_params[index].m_param.amaParam; } // ScriptParams::getAttribModArrayParam @@ -356,7 +356,7 @@ inline const ServerObjectTemplate::MentalStateMod & ScriptParams::getMentalState return *m_params[index].m_param.msmParam; } // ScriptParams::getMentalStateModParam -inline const stdvector::fwd & ScriptParams::getMentalStateModArrayParam(int index) const +inline const std::vector & ScriptParams::getMentalStateModArrayParam(int index) const { return *m_params[index].m_param.amsmParam; } // ScriptParams::getMentalStateModArrayParam @@ -396,12 +396,12 @@ inline const ValueDictionary & ScriptParams::getValueDictionaryParam(int index) return *m_params[index].m_param.valueDictionaryParam; } -inline const stdvector::fwd & ScriptParams::getValueDictionaryArrayParam(int index) const +inline const std::vector & ScriptParams::getValueDictionaryArrayParam(int index) const { return *m_params[index].m_param.valueDictionaryArrayParam; } -inline const stdvector::fwd & ScriptParams::getByteArrayParam(int index) const +inline const std::vector & ScriptParams::getByteArrayParam(int index) const { return *m_params[index].m_param.byteArrayParam; } // ScriptParams::getIntArrayParam diff --git a/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.h b/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.h index 9f47c461..7c31741c 100755 --- a/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.h +++ b/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.h @@ -30,7 +30,7 @@ public: }; static std::string const & getFreeCtsFileName(); - static stdmultimap::fwd const & getFreeCtsInfo(); + static std::multimap const & getFreeCtsInfo(); static FreeCtsDataTable::FreeCtsInfo const * isFreeCtsSourceCluster(std::string const & sourceCluster); static FreeCtsDataTable::FreeCtsInfo const * wouldCharacterTransferBeFree(time_t sourceCharacterCreateTime, uint32 sourceStationId, std::string const & sourceCluster, uint32 targetStationId, std::string const & targetCluster, bool ignoreTimeRestriction); static FreeCtsDataTable::FreeCtsInfo const * getFreeCtsInfoForCharacter(time_t sourceCharacterCreateTime, std::string const & sourceCluster, bool ignoreTimeRestriction); diff --git a/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h b/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h index d32e2fea..c0116f50 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h +++ b/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h @@ -24,9 +24,9 @@ class VectorArgb; class BoxTreeNode; class Iff; -typedef stdvector::fwd BoxTreeNodeVec; -typedef stdvector::fwd BoxVec; -typedef stdvector::fwd IdVec; +typedef std::vector BoxTreeNodeVec; +typedef std::vector BoxVec; +typedef std::vector IdVec; // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.h b/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.h index 4fc93148..f6aabcfb 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.h +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.h @@ -28,8 +28,8 @@ class Range; class BoxTree; class FloorLocator; -typedef stdvector::fwd VectorVector; -typedef stdvector::fwd IntVector; +typedef std::vector VectorVector; +typedef std::vector IntVector; // ====================================================================== diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h b/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h index 1d75fc8b..2e8c8195 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h @@ -28,7 +28,7 @@ class SpatialDatabase; class SpatialSubdivisionHandle; class Transform; -typedef stdvector::fwd ColliderList; +typedef std::vector ColliderList; // ====================================================================== diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h b/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h index 77bf73b0..aad29ae5 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h @@ -65,11 +65,11 @@ struct CellPosition }; -typedef stdvector::fwd ColliderList; -typedef stdvector::fwd ObstacleList; -typedef stdvector::fwd ContactList; -typedef stdvector::fwd FloorContactList; -typedef stdvector::fwd CellPositionList; +typedef std::vector ColliderList; +typedef std::vector ObstacleList; +typedef std::vector ContactList; +typedef std::vector FloorContactList; +typedef std::vector CellPositionList; struct MoveSegment { diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionSurface.h b/engine/shared/library/sharedCollision/src/shared/core/CollisionSurface.h index 2d245655..2313a181 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionSurface.h +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionSurface.h @@ -52,7 +52,7 @@ struct LineIntersectResult ContactPoint m_hitLoc; }; -typedef stdvector::fwd LineIntersectResultVec; +typedef std::vector LineIntersectResultVec; // ====================================================================== diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.h b/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.h index 6f39dab5..79c9830b 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.h +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.h @@ -28,9 +28,9 @@ class CollisionProperty; class MultiShape; class BaseExtent; -typedef stdvector::fwd VectorVector; -typedef stdvector::fwd VertexList; -typedef stdvector::fwd ExtentVec; +typedef std::vector VectorVector; +typedef std::vector VertexList; +typedef std::vector ExtentVec; // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.h b/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.h index db5bf1e3..34ee284d 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.h +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.h @@ -28,9 +28,9 @@ class SpatialDatabase; class Sphere; class MultiShape; -typedef stdvector::fwd ObjectVec; -typedef stdvector::fwd ColliderList; -typedef stdvector::fwd FootprintList; +typedef std::vector ObjectVec; +typedef std::vector ColliderList; +typedef std::vector FootprintList; // ====================================================================== @@ -120,7 +120,7 @@ public: // ---------- - static bool findLocators ( CellProperty const * cell, Vector const & point, stdvector::fwd & outLocs ); + static bool findLocators ( CellProperty const * cell, Vector const & point, std::vector & outLocs ); static bool makeLocator ( CellProperty const * cell, Vector const & point, FloorLocator & outLoc); diff --git a/engine/shared/library/sharedCollision/src/shared/core/Containment3d.h b/engine/shared/library/sharedCollision/src/shared/core/Containment3d.h index 12fb0a38..583f1c2f 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/Containment3d.h +++ b/engine/shared/library/sharedCollision/src/shared/core/Containment3d.h @@ -27,7 +27,7 @@ class MultiShape; #include "sharedCollision/CollisionEnums.h" -typedef stdvector::fwd VectorVector; +typedef std::vector VectorVector; // ---------- // These methods should always be of the form diff --git a/engine/shared/library/sharedCollision/src/shared/core/Distance3d.h b/engine/shared/library/sharedCollision/src/shared/core/Distance3d.h index 2309a92d..267418b7 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/Distance3d.h +++ b/engine/shared/library/sharedCollision/src/shared/core/Distance3d.h @@ -26,7 +26,7 @@ class Range; class Sphere; class MultiShape; -typedef stdvector::fwd VertexList; +typedef std::vector VertexList; #include "sharedCollision/CollisionEnums.h" #include "sharedMath/Vector.h" diff --git a/engine/shared/library/sharedCollision/src/shared/core/DoorObject.h b/engine/shared/library/sharedCollision/src/shared/core/DoorObject.h index 55384ade..02577ede 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/DoorObject.h +++ b/engine/shared/library/sharedCollision/src/shared/core/DoorObject.h @@ -21,7 +21,7 @@ class DoorObject; class NeighborObject; class CollisionProperty; -typedef stdvector::fwd VertexList; +typedef std::vector VertexList; // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h b/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h index d48f177d..ae810eee 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h +++ b/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h @@ -32,7 +32,7 @@ class Appearance; template class DataResourceList; typedef DataResourceList FloorMeshList; -typedef stdvector::fwd FloorTriVec; +typedef std::vector FloorTriVec; typedef std::pair IntPair; class FloorEdgeId @@ -47,9 +47,9 @@ public: int edgeId; }; -typedef stdvector::fwd FloorEdgeIdVec; +typedef std::vector FloorEdgeIdVec; -typedef stdvector::fwd FloorLocatorVec; +typedef std::vector FloorLocatorVec; // ====================================================================== @@ -281,7 +281,7 @@ protected: typedef std::pair EdgeId; - typedef stdvector::fwd EdgeIdVec; + typedef std::vector EdgeIdVec; void findAdjacentBoundaryEdges ( VectorVector const & polyVerts, EdgeIdVec & outIds ) const; diff --git a/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp b/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp index 680ff016..e1b6b5ee 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp @@ -16,7 +16,7 @@ namespace FootprintForceReattachManagerNamespace { - typedef stdvector::fwd StringVector; + typedef std::vector StringVector; StringVector ms_sceneIds; diff --git a/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.h b/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.h index 96e4bba1..e8a28ead 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.h +++ b/engine/shared/library/sharedCollision/src/shared/core/Overlap3d.h @@ -26,7 +26,7 @@ class Range; class Cylinder; class MultiShape; -typedef stdvector::fwd VertexList; +typedef std::vector VertexList; // ====================================================================== diff --git a/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.h b/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.h index 1b6553ba..63bef78b 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.h +++ b/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.h @@ -29,10 +29,10 @@ class Sphere; class Vector; class VectorArgb; -typedef stdvector::fwd FloorVec; -typedef stdvector::fwd ObjectVec; -typedef stdvector::fwd ObjectConstVec; -typedef stdvector::fwd ColliderList; +typedef std::vector FloorVec; +typedef std::vector ObjectVec; +typedef std::vector ObjectConstVec; +typedef std::vector ColliderList; template diff --git a/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.h b/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.h index 82d0d35f..1478d7c7 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.h +++ b/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.h @@ -57,7 +57,7 @@ protected: // ---------- - typedef stdvector< BaseExtent * >::fwd ExtentVec; + typedef std::vector< BaseExtent * > ExtentVec; ExtentVec * m_extents; diff --git a/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp index c32e7857..5bc43958 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp @@ -22,7 +22,7 @@ const Tag TAG_CMSH = TAG(C,M,S,H); -typedef stdvector::fwd VertexList; +typedef std::vector VertexList; // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedCommandParser/src/shared/CommandParser.h b/engine/shared/library/sharedCommandParser/src/shared/CommandParser.h index 50922e1d..74ff562d 100755 --- a/engine/shared/library/sharedCommandParser/src/shared/CommandParser.h +++ b/engine/shared/library/sharedCommandParser/src/shared/CommandParser.h @@ -49,7 +49,7 @@ class CommandParser public: typedef Unicode::String String_t; - typedef stdvector::fwd StringVector_t; + typedef std::vector StringVector_t; enum ErrorType { @@ -199,7 +199,7 @@ private: const CommandParser * m_parent; CommandParser * m_delegate; - typedef stdmap::fwd ErrorMsgMap_t; + typedef std::map ErrorMsgMap_t; static size_t ms_instanceCount; static String_t * ms_ERR_NO_ERROR_MSG_MSG; @@ -216,7 +216,7 @@ private: bool operator () (const CommandParser * a, const CommandParser * b) const; }; - typedef stdset::fwd CommandParserSet_t; + typedef std::set CommandParserSet_t; CommandParserSet_t * m_subCommands; diff --git a/engine/shared/library/sharedCommandParser/src/shared/CommandParserHistory.h b/engine/shared/library/sharedCommandParser/src/shared/CommandParserHistory.h index 787cb59f..5cb09d18 100755 --- a/engine/shared/library/sharedCommandParser/src/shared/CommandParserHistory.h +++ b/engine/shared/library/sharedCommandParser/src/shared/CommandParserHistory.h @@ -14,7 +14,7 @@ class CommandParserHistory { public: - typedef stddeque::fwd HistoryList_t; + typedef std::deque HistoryList_t; CommandParserHistory (); ~CommandParserHistory (); diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbProfiler.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbProfiler.h index be5e9f03..54a1e569 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbProfiler.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbProfiler.h @@ -33,7 +33,7 @@ namespace DB int m_fetchCount; }; - typedef stdmap::fwd QueryDataMapType; + typedef std::map QueryDataMapType; QueryDataMapType *m_queryDataMap; }; diff --git a/engine/shared/library/sharedDebug/src/shared/DataLint.cpp b/engine/shared/library/sharedDebug/src/shared/DataLint.cpp index 86da4ea8..62716893 100755 --- a/engine/shared/library/sharedDebug/src/shared/DataLint.cpp +++ b/engine/shared/library/sharedDebug/src/shared/DataLint.cpp @@ -27,9 +27,9 @@ namespace DataLintNamespace M_server }; - typedef stdvector::fwd StringList; + typedef std::vector StringList; typedef std::pair > WarningPair; - typedef stdvector::fwd WarningList; + typedef std::vector WarningList; typedef bool(*AssetFunction)(char const *); bool ms_installed = false; diff --git a/engine/shared/library/sharedDebug/src/shared/DataLint.h b/engine/shared/library/sharedDebug/src/shared/DataLint.h index 7a732df2..0c88c593 100755 --- a/engine/shared/library/sharedDebug/src/shared/DataLint.h +++ b/engine/shared/library/sharedDebug/src/shared/DataLint.h @@ -14,7 +14,7 @@ class DataLint { public: - typedef stdvector >::fwd StringPairList; + typedef std::vector > StringPairList; public: diff --git a/engine/shared/library/sharedDebug/src/shared/DebugFlags.h b/engine/shared/library/sharedDebug/src/shared/DebugFlags.h index fcab1e0b..e49b084f 100755 --- a/engine/shared/library/sharedDebug/src/shared/DebugFlags.h +++ b/engine/shared/library/sharedDebug/src/shared/DebugFlags.h @@ -62,7 +62,7 @@ private: private: - typedef stdvector::fwd FlagVector; + typedef std::vector FlagVector; static FlagVector ms_flagsSortedByName; static FlagVector ms_flagsSortedByReportPriority; diff --git a/engine/shared/library/sharedDebug/src/shared/DebugKey.h b/engine/shared/library/sharedDebug/src/shared/DebugKey.h index ba53ed1e..ea0c46cd 100755 --- a/engine/shared/library/sharedDebug/src/shared/DebugKey.h +++ b/engine/shared/library/sharedDebug/src/shared/DebugKey.h @@ -41,7 +41,7 @@ private: bool operator <(const Flag &rhs) const; }; - typedef stdvector::fwd FlagVector; + typedef std::vector FlagVector; private: diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h b/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h index f2b7070c..bdb5e62a 100755 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h @@ -159,15 +159,15 @@ protected: static SendFunction ms_sendFunction; static IsReadyFunction ms_isReadyFunction; - typedef stdmap::fwd StreamMap; + typedef std::map StreamMap; ///stream names static StreamMap *ms_streams; - typedef stdmap::fwd VariableMap; + typedef std::map VariableMap; ///What variables are registered static VariableMap *ms_variables; - typedef stdmap::fwd StaticViewMap; + typedef std::map StaticViewMap; ///StaticView names static StaticViewMap *ms_staticViews; @@ -184,10 +184,10 @@ protected: static bool ms_opened; ///What streaming channels are squelched (i.e. don't send to client at all) - static stdmap::fwd *ms_squelchedStream; + static std::map *ms_squelchedStream; ///What static channels are squelched (i.e. don't send to client at all) - static stdmap::fwd *ms_squelchedStatic; + static std::map *ms_squelchedStatic; ///the next stream number static uint32 ms_nextStream; @@ -198,10 +198,10 @@ protected: ///the next staticView number static uint32 ms_nextStaticView; - typedef stdmap::fwd VariableValueMap; + typedef std::map VariableValueMap; static VariableValueMap *ms_variableValues; - typedef stdmap::fwd MovementFunctionMap; + typedef std::map MovementFunctionMap; static MovementFunctionMap *ms_upFunctionMap; static MovementFunctionMap *ms_downFunctionMap; static MovementFunctionMap *ms_leftFunctionMap; diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h index 8daccef3..62f25938 100755 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h @@ -24,7 +24,7 @@ class RemoteDebug::Channel void addChild(Channel *child); const std::string& name(); private: - typedef stdlist::fwd NodeList; + typedef std::list NodeList; ///its children NodeList* m_children; ///the fully qualified name of the channel diff --git a/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp b/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp index b810a0b8..f85bfd89 100755 --- a/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp +++ b/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp @@ -48,7 +48,7 @@ namespace AsynchronousLoaderNamespace AsynchronousLoader::FetchFunction fetchFunction; AsynchronousLoader::ReleaseFunction releaseFunction; }; - typedef stdvector::fwd ExtensionFunctionsList; + typedef std::vector ExtensionFunctionsList; struct FileRecord { @@ -61,7 +61,7 @@ namespace AsynchronousLoaderNamespace FileRecord(); FileRecord &operator =(const FileRecord &); }; - typedef stdvector::fwd FileRecordList; + typedef std::vector FileRecordList; class FileMapComparison { @@ -69,7 +69,7 @@ namespace AsynchronousLoaderNamespace bool operator ()(const char *lhs, const char *rhs) const; }; - typedef stdmap::fwd FileMap; + typedef std::map FileMap; struct CachedFile { @@ -77,8 +77,8 @@ namespace AsynchronousLoaderNamespace AbstractFile *file; const void *resource; }; - typedef stdvector::fwd CachedFiles; - typedef stdvector::fwd CachedFilesPool; + typedef std::vector CachedFiles; + typedef std::vector CachedFilesPool; struct Request { @@ -87,7 +87,7 @@ namespace AsynchronousLoaderNamespace void *data; CachedFiles *cachedFiles; }; - typedef stddeque::fwd Requests; + typedef std::deque Requests; void remove(); void submitRequest(Request *request); diff --git a/engine/shared/library/sharedFile/src/shared/TreeFile.h b/engine/shared/library/sharedFile/src/shared/TreeFile.h index f28e7315..153c3c2a 100755 --- a/engine/shared/library/sharedFile/src/shared/TreeFile.h +++ b/engine/shared/library/sharedFile/src/shared/TreeFile.h @@ -104,7 +104,7 @@ public: private: - typedef stdvector::fwd SearchNodes; + typedef std::vector SearchNodes; private: diff --git a/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h b/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h index e6da0117..704cac1c 100755 --- a/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h +++ b/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h @@ -337,7 +337,7 @@ private: private: class CachedFile; - typedef stdmap::fwd CachedFileMap; + typedef std::map CachedFileMap; CachedFileMap * const m_cachedFileMap; }; diff --git a/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h b/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h index 09a78599..1e3dd4d8 100755 --- a/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h +++ b/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h @@ -43,7 +43,7 @@ public: /// a buffer holding the entry string, which may be recast to other types char *m_entry; }; - typedef stdlist::fwd ElementList; + typedef std::list ElementList; // ----------------------------------------------------------------------- @@ -80,7 +80,7 @@ public: /// track whether this was added lazily (not explicitly in the config file) bool m_lazyAdd; }; - typedef stdmap::fwd KeyMap; + typedef std::map KeyMap; // ----------------------------------------------------------------------- @@ -124,7 +124,7 @@ public: ///String representation of the section's name char* m_name; }; - typedef stdmap::fwd SectionMap; + typedef std::map SectionMap; public: //public interface diff --git a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp index 9e8ca2b6..ab00efba 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp @@ -169,7 +169,7 @@ ConstCharCrcString const CrcStringTable::lookUp(uint32 crc) const // ---------------------------------------------------------------------- -void CrcStringTable::getAllStrings(stdvector::fwd & strings) const +void CrcStringTable::getAllStrings(std::vector & strings) const { strings.reserve(strings.size() + m_numberOfEntries); diff --git a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.h b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.h index 16e7d0e2..f03de6b7 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.h +++ b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.h @@ -30,7 +30,7 @@ public: ConstCharCrcString const lookUp(const char * string) const; ConstCharCrcString const lookUp(uint32 crc) const; - void getAllStrings(stdvector::fwd & strings) const; + void getAllStrings(std::vector & strings) const; int getNumberOfStrings() const; ConstCharCrcString const getString(int index) const; diff --git a/engine/shared/library/sharedFoundation/src/shared/DebugInfoManager.h b/engine/shared/library/sharedFoundation/src/shared/DebugInfoManager.h index 757673a9..8a88cca0 100755 --- a/engine/shared/library/sharedFoundation/src/shared/DebugInfoManager.h +++ b/engine/shared/library/sharedFoundation/src/shared/DebugInfoManager.h @@ -19,8 +19,8 @@ class Vector; class DebugInfoManager { public: - typedef stdmap::fwd PropertySection; - typedef stdmap::fwd PropertyMap; + typedef std::map PropertySection; + typedef std::map PropertyMap; public: static void addProperty(PropertyMap & propertyMap, std::string const & section, std::string const & propertyName, int propertyValue); diff --git a/engine/shared/library/sharedFoundation/src/shared/MessageQueue.h b/engine/shared/library/sharedFoundation/src/shared/MessageQueue.h index 46b67b8e..717dc666 100755 --- a/engine/shared/library/sharedFoundation/src/shared/MessageQueue.h +++ b/engine/shared/library/sharedFoundation/src/shared/MessageQueue.h @@ -74,7 +74,7 @@ private: private: - typedef stdvector::fwd MessageList; + typedef std::vector MessageList; private: diff --git a/engine/shared/library/sharedFoundation/src/shared/Scheduler.h b/engine/shared/library/sharedFoundation/src/shared/Scheduler.h index 97a2aaee..7dd29d68 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Scheduler.h +++ b/engine/shared/library/sharedFoundation/src/shared/Scheduler.h @@ -91,8 +91,8 @@ private: private: - stdvector::fwd * deferredCallbackEntryAdditions; - stdpriority_queue >, StaticCallbackEntry::Compare>::fwd * callbackQueue; + std::vector * deferredCallbackEntryAdditions; + std::priority_queue >, StaticCallbackEntry::Compare> * callbackQueue; private: diff --git a/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h b/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h index 110a0368..88d01f7d 100755 --- a/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h +++ b/engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h @@ -48,7 +48,7 @@ private: private: - static stdvector::fwd & getStaticCallbackFreeList(); + static std::vector & getStaticCallbackFreeList(); private: diff --git a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h index 55980e13..cd1b0e75 100755 --- a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h +++ b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h @@ -8,131 +8,13 @@ #ifndef INCLUDED_StlForwardDeclaration_H #define INCLUDED_StlForwardDeclaration_H -// ====================================================================== - -// Setup handling for template value defaults that require accessing the -// {template type}::fwd value. gcc 3.2 requires typename here, gcc 2.95 -// optionally accepts typename here, msvc 6 will not accept it here. - -#if defined(PLATFORM_WIN32) || defined(WIN32) - -#define FORWARD_TYPENAME - -#elif defined(PLATFORM_LINUX) - -#define FORWARD_TYPENAME typename - -#else - -#error unsupported platform - -#endif - -// ====================================================================== - -// grab stlport configuration -//#include "stl/config/features.h" // uncomment for newer stlport versions -//#include "stl/_config.h" - -namespace std -{ - template struct less; - template struct equal_to; - template struct pair; - template struct hash; - template class allocator; - template class basic_string; - template struct char_traits; - - template class bitset; - template class deque; - template class list; - template class queue; - template class vector; - template class stack; - template class priority_queue; - template class map; - //template class hash_map; - template class multimap; - template class set; - //template class hash_set; - template class multiset; - - typedef basic_string, allocator > string; - - template class unordered_map; - template class unordered_set; -} - -template > struct stddeque -{ - typedef std::deque<_Tp, _Alloc> fwd; -}; - -template > struct stdlist -{ - typedef std::list<_Tp, _Alloc> fwd; -}; - -template , class _Alloc = std::allocator< std::pair > > struct stdmap -{ - typedef std::map<_Key, _Tp, _Compare, _Alloc> fwd; -}; - -//template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair > > struct stdhash_map -//{ -// typedef std::hash_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; -//}; - -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair > > struct stdunordered_map -{ - typedef std::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; -}; - -template , class _Alloc = std::allocator< std::pair > > struct stdmultimap -{ - typedef std::multimap<_Key, _Tp, _Compare, _Alloc> fwd; -}; - -template , class _Alloc = std::allocator<_Key> > struct stdset -{ - typedef std::set<_Key, _Compare, _Alloc> fwd; -}; - -//template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdhash_set -//{ -// typedef std::hash_set<_Key, _HashFcn, _Compare, _Alloc> fwd; -//}; - -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set -{ - typedef std::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd; -}; - -template , class _Alloc = std::allocator<_Key> > struct stdmultiset -{ - typedef std::multiset<_Key, _Compare, _Alloc> fwd; -}; - -template > struct stdvector -{ - typedef std::vector<_Tp, _Alloc> fwd; -}; - -template ::fwd, class _Compare = std::less > struct stdpriority_queue -{ - typedef std::priority_queue<_Tp, _Container, _Compare> fwd; -}; - -template ::fwd > struct stdqueue -{ - typedef std::queue<_Tp, _Sequence> fwd; -}; - -template ::fwd > struct stdstack -{ - typedef std::stack<_Tp, _Sequence> fwd; -}; +#include +#include +#include +#include +#include +#include +#include namespace Unicode { diff --git a/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp b/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp index c56201a6..b4cb6c5b 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp @@ -18,8 +18,8 @@ namespace WatchedByListNamespace { - typedef stdvector::fwd List; - typedef stdvector::fwd ListList; + typedef std::vector List; + typedef std::vector ListList; ListList ms_listList; diff --git a/engine/shared/library/sharedFoundation/src/shared/Watcher.h b/engine/shared/library/sharedFoundation/src/shared/Watcher.h index 921b91d5..2898f725 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Watcher.h +++ b/engine/shared/library/sharedFoundation/src/shared/Watcher.h @@ -151,7 +151,7 @@ private: private: - typedef stdvector::fwd List; + typedef std::vector List; private: diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h index c69588ba..3bb8928d 100755 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h @@ -62,59 +62,59 @@ class DynamicVariable void setPosition(int newPosition); explicit DynamicVariable(int value); - explicit DynamicVariable(const stdvector::fwd & value); + explicit DynamicVariable(const std::vector & value); explicit DynamicVariable(float value); - explicit DynamicVariable(const stdvector::fwd & value); + explicit DynamicVariable(const std::vector & value); explicit DynamicVariable(const Unicode::String &value); explicit DynamicVariable(const std::string &value); - explicit DynamicVariable(const stdvector::fwd & value); + explicit DynamicVariable(const std::vector & value); explicit DynamicVariable(const NetworkId & value); - explicit DynamicVariable(const stdvector::fwd & value); + explicit DynamicVariable(const std::vector & value); explicit DynamicVariable(const DynamicVariableLocationData & value); - explicit DynamicVariable(const stdvector::fwd & value); + explicit DynamicVariable(const std::vector & value); explicit DynamicVariable(const StringId &value); - explicit DynamicVariable(const stdvector::fwd &value); + explicit DynamicVariable(const std::vector &value); explicit DynamicVariable(const Transform &value); - explicit DynamicVariable(const stdvector::fwd &value); + explicit DynamicVariable(const std::vector &value); explicit DynamicVariable(const Vector &value); - explicit DynamicVariable(const stdvector::fwd &value); + explicit DynamicVariable(const std::vector &value); bool get(int & value) const; - bool get(stdvector::fwd & value) const; + bool get(std::vector & value) const; bool get(float & value) const; - bool get(stdvector::fwd & value) const; + bool get(std::vector & value) const; bool get(Unicode::String & value) const; bool get(std::string & value) const; - bool get(stdvector::fwd & value) const; + bool get(std::vector & value) const; bool get(NetworkId & value) const; - bool get(stdvector::fwd & value) const; + bool get(std::vector & value) const; bool get(DynamicVariableLocationData & value) const; - bool get(stdvector::fwd & value) const; + bool get(std::vector & value) const; bool get(StringId &value) const; - bool get(stdvector::fwd &value) const; + bool get(std::vector &value) const; bool get(Transform &value) const; - bool get(stdvector::fwd &value) const; + bool get(std::vector &value) const; bool get(Vector &value) const; - bool get(stdvector::fwd &value) const; + bool get(std::vector &value) const; int getUTF8Length() const; static int getUTF8Length(const int & value); - static int getUTF8Length(const stdvector::fwd & value); + static int getUTF8Length(const std::vector & value); static int getUTF8Length(const float & value); - static int getUTF8Length(const stdvector::fwd & value); + static int getUTF8Length(const std::vector & value); static int getUTF8Length(const Unicode::String &value); static int getUTF8Length(const std::string &value); - static int getUTF8Length(const stdvector::fwd & value); + static int getUTF8Length(const std::vector & value); static int getUTF8Length(const NetworkId & value); - static int getUTF8Length(const stdvector::fwd & value); + static int getUTF8Length(const std::vector & value); static int getUTF8Length(const DynamicVariableLocationData & value); - static int getUTF8Length(const stdvector::fwd & value); + static int getUTF8Length(const std::vector & value); static int getUTF8Length(const StringId &value); - static int getUTF8Length(const stdvector::fwd &value); + static int getUTF8Length(const std::vector &value); static int getUTF8Length(const Transform &value); - static int getUTF8Length(const stdvector::fwd &value); + static int getUTF8Length(const std::vector &value); static int getUTF8Length(const Vector &value); - static int getUTF8Length(const stdvector::fwd &value); + static int getUTF8Length(const std::vector &value); public: // functions used for persistence: @@ -125,22 +125,22 @@ public: private: static void pack(int value, Unicode::String & packedData); - static void pack(const stdvector::fwd & value, Unicode::String & packedData); + static void pack(const std::vector & value, Unicode::String & packedData); static void pack(float value, Unicode::String & packedData); - static void pack(const stdvector::fwd & value, Unicode::String & packedData); + static void pack(const std::vector & value, Unicode::String & packedData); static void pack(const Unicode::String &value, Unicode::String & packedData); static void pack(const std::string &value, Unicode::String & packedData); - static void pack(const stdvector::fwd & value, Unicode::String & packedData); + static void pack(const std::vector & value, Unicode::String & packedData); static void pack(const NetworkId & value, Unicode::String & packedData); - static void pack(const stdvector::fwd & value, Unicode::String & packedData); + static void pack(const std::vector & value, Unicode::String & packedData); static void pack(const DynamicVariableLocationData & value, Unicode::String & packedData); - static void pack(const stdvector::fwd & value, Unicode::String & packedData); + static void pack(const std::vector & value, Unicode::String & packedData); static void pack(const StringId &value, Unicode::String & packedData); - static void pack(const stdvector::fwd &value, Unicode::String & packedData); + static void pack(const std::vector &value, Unicode::String & packedData); static void pack(const Transform &value, Unicode::String & packedData); - static void pack(const stdvector::fwd &value, Unicode::String & packedData); + static void pack(const std::vector &value, Unicode::String & packedData); static void pack(const Vector &value, Unicode::String & packedData); - static void pack(const stdvector::fwd &value, Unicode::String & packedData); + static void pack(const std::vector &value, Unicode::String & packedData); private: DynamicVariableType m_type; diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.cpp b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.cpp index d0cda873..90aede1a 100755 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.cpp @@ -221,22 +221,22 @@ bool DynamicVariableList::getItem(const std::string &name, T &value) const \ } GET_ITEM(int) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) GET_ITEM(float) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) GET_ITEM(Unicode::String) GET_ITEM(std::string) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) GET_ITEM(NetworkId) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) GET_ITEM(DynamicVariableLocationData) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) GET_ITEM(StringId) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) GET_ITEM(Transform) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) GET_ITEM(Vector) -GET_ITEM(stdvector::fwd) +GET_ITEM(std::vector) // ====================================================================== // DynamicVariableList setters @@ -250,22 +250,22 @@ bool DynamicVariableList::setItem(const std::string &name, const T &value) \ } SET_ITEM(int) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) SET_ITEM(float) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) SET_ITEM(Unicode::String) SET_ITEM(std::string) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) SET_ITEM(NetworkId) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) SET_ITEM(DynamicVariableLocationData) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) SET_ITEM(StringId) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) SET_ITEM(Transform) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) SET_ITEM(Vector) -SET_ITEM(stdvector::fwd) +SET_ITEM(std::vector) bool DynamicVariableList::setItem(const std::string &name, DynamicVariable value) { diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h index 6a5a22c3..563a28a5 100755 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h @@ -52,40 +52,40 @@ public: size_t size() const; bool getItem(const std::string &name,int & value) const; - bool getItem(const std::string &name,stdvector::fwd & value) const; + bool getItem(const std::string &name,std::vector & value) const; bool getItem(const std::string &name,float & value) const; - bool getItem(const std::string &name,stdvector::fwd & value) const; + bool getItem(const std::string &name,std::vector & value) const; bool getItem(const std::string &name,Unicode::String & value) const; bool getItem(const std::string &name,std::string & value) const; - bool getItem(const std::string &name,stdvector::fwd & value) const; + bool getItem(const std::string &name,std::vector & value) const; bool getItem(const std::string &name,NetworkId & value) const; - bool getItem(const std::string &name,stdvector::fwd & value) const; + bool getItem(const std::string &name,std::vector & value) const; bool getItem(const std::string &name,DynamicVariableLocationData & value) const; - bool getItem(const std::string &name,stdvector::fwd & value) const; + bool getItem(const std::string &name,std::vector & value) const; bool getItem(const std::string &name,StringId &value) const; - bool getItem(const std::string &name,stdvector::fwd &value) const; + bool getItem(const std::string &name,std::vector &value) const; bool getItem(const std::string &name,Transform &value) const; - bool getItem(const std::string &name,stdvector::fwd &value) const; + bool getItem(const std::string &name,std::vector &value) const; bool getItem(const std::string &name,Vector &value) const; - bool getItem(const std::string &name,stdvector::fwd &value) const; + bool getItem(const std::string &name,std::vector &value) const; bool setItem(const std::string &name, const int & value); - bool setItem(const std::string &name, const stdvector::fwd & value); + bool setItem(const std::string &name, const std::vector & value); bool setItem(const std::string &name, const float & value); - bool setItem(const std::string &name, const stdvector::fwd & value); + bool setItem(const std::string &name, const std::vector & value); bool setItem(const std::string &name, const Unicode::String & value); bool setItem(const std::string &name, const std::string & value); - bool setItem(const std::string &name, const stdvector::fwd & value); + bool setItem(const std::string &name, const std::vector & value); bool setItem(const std::string &name, const NetworkId & value); - bool setItem(const std::string &name, const stdvector::fwd & value); + bool setItem(const std::string &name, const std::vector & value); bool setItem(const std::string &name, const DynamicVariableLocationData & value); - bool setItem(const std::string &name, const stdvector::fwd & value); + bool setItem(const std::string &name, const std::vector & value); bool setItem(const std::string &name, const StringId &value); - bool setItem(const std::string &name, const stdvector::fwd &value); + bool setItem(const std::string &name, const std::vector &value); bool setItem(const std::string &name, const Transform &value); - bool setItem(const std::string &name, const stdvector::fwd &value); + bool setItem(const std::string &name, const std::vector &value); bool setItem(const std::string &name, const Vector &value); - bool setItem(const std::string &name, const stdvector::fwd &value); + bool setItem(const std::string &name, const std::vector &value); bool setItem(const std::string &name, DynamicVariable value); int getRevision() const; diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.cpp b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.cpp index dc905c32..5fd4b4db 100755 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.cpp @@ -183,22 +183,22 @@ bool DynamicVariableListNestedList::getItem(const std::string &name, T &value) c } NESTED_LIST_GET_ITEM(int) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) NESTED_LIST_GET_ITEM(float) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) NESTED_LIST_GET_ITEM(Unicode::String) NESTED_LIST_GET_ITEM(std::string) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) NESTED_LIST_GET_ITEM(NetworkId) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) NESTED_LIST_GET_ITEM(DynamicVariableLocationData) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) NESTED_LIST_GET_ITEM(StringId) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) NESTED_LIST_GET_ITEM(Transform) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) NESTED_LIST_GET_ITEM(Vector) -NESTED_LIST_GET_ITEM(stdvector::fwd) +NESTED_LIST_GET_ITEM(std::vector) // ====================================================================== // DynamicVariableListNestedList::const_iterator @@ -308,20 +308,20 @@ bool DynamicVariableListNestedList::const_iterator::getValue(T &value) const \ } NESTED_LIST_CONST_ITERATOR_GET_VALUE(int) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) NESTED_LIST_CONST_ITERATOR_GET_VALUE(float) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) NESTED_LIST_CONST_ITERATOR_GET_VALUE(Unicode::String) NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::string) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) NESTED_LIST_CONST_ITERATOR_GET_VALUE(NetworkId) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) NESTED_LIST_CONST_ITERATOR_GET_VALUE(DynamicVariableLocationData) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) NESTED_LIST_CONST_ITERATOR_GET_VALUE(StringId) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) NESTED_LIST_CONST_ITERATOR_GET_VALUE(Transform) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) NESTED_LIST_CONST_ITERATOR_GET_VALUE(Vector) -NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector::fwd) +NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector) //====================================================================== diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h index 2d321764..d243a3ee 100755 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h @@ -58,22 +58,22 @@ public: bool operator!= (const const_iterator &rhs) const; bool getValue (int & value) const; - bool getValue (stdvector::fwd & value) const; + bool getValue (std::vector & value) const; bool getValue (float & value) const; - bool getValue (stdvector::fwd & value) const; + bool getValue (std::vector & value) const; bool getValue (Unicode::String & value) const; bool getValue (std::string & value) const; - bool getValue (stdvector::fwd & value) const; + bool getValue (std::vector & value) const; bool getValue (NetworkId & value) const; - bool getValue (stdvector::fwd & value) const; + bool getValue (std::vector & value) const; bool getValue (DynamicVariableLocationData & value) const; - bool getValue (stdvector::fwd & value) const; + bool getValue (std::vector & value) const; bool getValue (StringId &value) const; - bool getValue (stdvector::fwd &value) const; + bool getValue (std::vector &value) const; bool getValue (Transform &value) const; - bool getValue (stdvector::fwd &value) const; + bool getValue (std::vector &value) const; bool getValue (Vector &value) const; - bool getValue (stdvector::fwd &value) const; + bool getValue (std::vector &value) const; private: const DynamicVariableListNestedList & m_context; @@ -103,22 +103,22 @@ public: const_iterator getItemByPosition (int position) const; bool getItem (const std::string &name,int & value) const; - bool getItem (const std::string &name,stdvector::fwd & value) const; + bool getItem (const std::string &name,std::vector & value) const; bool getItem (const std::string &name,float & value) const; - bool getItem (const std::string &name,stdvector::fwd & value) const; + bool getItem (const std::string &name,std::vector & value) const; bool getItem (const std::string &name,Unicode::String & value) const; bool getItem (const std::string &name,std::string & value) const; - bool getItem (const std::string &name,stdvector::fwd & value) const; + bool getItem (const std::string &name,std::vector & value) const; bool getItem (const std::string &name,NetworkId & value) const; - bool getItem (const std::string &name,stdvector::fwd & value) const; + bool getItem (const std::string &name,std::vector & value) const; bool getItem (const std::string &name,DynamicVariableLocationData & value) const; - bool getItem (const std::string &name,stdvector::fwd & value) const; + bool getItem (const std::string &name,std::vector & value) const; bool getItem (const std::string &name,StringId &value) const; - bool getItem (const std::string &name,stdvector::fwd &value) const; + bool getItem (const std::string &name,std::vector &value) const; bool getItem (const std::string &name,Transform &value) const; - bool getItem (const std::string &name,stdvector::fwd &value) const; + bool getItem (const std::string &name,std::vector &value) const; bool getItem (const std::string &name,Vector &value) const; - bool getItem (const std::string &name,stdvector::fwd &value) const; + bool getItem (const std::string &name,std::vector &value) const; private: const DynamicVariableList & m_list; diff --git a/engine/shared/library/sharedFoundation/src/win32/Os.h b/engine/shared/library/sharedFoundation/src/win32/Os.h index afb3be40..bcbe3060 100755 --- a/engine/shared/library/sharedFoundation/src/win32/Os.h +++ b/engine/shared/library/sharedFoundation/src/win32/Os.h @@ -27,7 +27,7 @@ public: typedef void (*QueueCharacterHookFunction)(int keyboard, int character); typedef void (*SetSystemMouseCursorPositionHookFunction)(int x, int y); typedef bool (*GetHardwareMouseCursorEnabled)(); - typedef void (*GetOtherAdapterRectsHookFunction)(stdvector::fwd &); + typedef void (*GetOtherAdapterRectsHookFunction)(std::vector &); typedef void (*WindowPositionChangedHookFunction)(); typedef void (*DisplayModeChangedHookFunction)(); typedef void (*InputLanguageChangedHookFunction)(); diff --git a/engine/shared/library/sharedGame/src/shared/command/CommandTable.h b/engine/shared/library/sharedGame/src/shared/command/CommandTable.h index c4cd12ac..f1edb140 100755 --- a/engine/shared/library/sharedGame/src/shared/command/CommandTable.h +++ b/engine/shared/library/sharedGame/src/shared/command/CommandTable.h @@ -22,9 +22,9 @@ class Command; class CommandTable // static class { public: - typedef stdmap::fwd CommandMap; + typedef std::map CommandMap; - static void loadCommandTables (stdvector::fwd const &commandTableFilenames); + static void loadCommandTables (std::vector const &commandTableFilenames); static void addCppFunction (std::string const &funcName, CommandCppFunc::Type func); static Command const & getCommand (uint32 commandHash); static CommandMap const & getCommandMap (); diff --git a/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h b/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h index a45d3649..254714a4 100755 --- a/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h +++ b/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h @@ -23,13 +23,13 @@ class AiDebugString { public: - typedef stdvector::fwd TransformList; - typedef stdvector::fwd TextList; - typedef stdvector > >::fwd LineList; - typedef stdvector >::fwd PathList; - typedef stdvector > >::fwd CircleList; - typedef stdvector >::fwd AxisList; - typedef stdvector > >::fwd ConeList; + typedef std::vector TransformList; + typedef std::vector TextList; + typedef std::vector > > LineList; + typedef std::vector > PathList; + typedef std::vector > > CircleList; + typedef std::vector > AxisList; + typedef std::vector > > ConeList; // Use to custom embed multiple colors in text diff --git a/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h b/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h index 64537442..ca9d1b26 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h +++ b/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h @@ -68,7 +68,7 @@ public: class CollectionInfoCollection { public: - CollectionInfoCollection(std::string const & cName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, stdvector::fwd const & pCategories, std::vector const & pTitles, bool pNoReward, bool pTrackServerFirst, CollectionInfoPage const & pPage) : + CollectionInfoCollection(std::string const & cName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, std::vector const & pCategories, std::vector const & pTitles, bool pNoReward, bool pTrackServerFirst, CollectionInfoPage const & pPage) : name(cName), icon(pIcon), showIfNotYetEarned(pShowIfNotYetEarned), hidden(pHidden), categories(pCategories), titles(pTitles), noReward(pNoReward), trackServerFirst(pTrackServerFirst), serverFirstClaimTime(0), serverFirstClaimantId(), serverFirstClaimantName(), page(pPage) {}; std::string const name; @@ -96,7 +96,7 @@ public: friend class CollectionsDataTable; public: - CollectionInfoSlot(std::string const & pName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, bool pNotifyScriptOnModify, int pSlotIdIndex, int pBeginSlotId, int pAbsoluteBeginSlotId, int pEndSlotId, int pAbsoluteEndSlotId, unsigned long pMaxSlotValue, unsigned long pMaxValueForNumBits, stdvector::fwd const & pCategories, stdvector::fwd const & pPrereqs, std::string const & pMusic, std::vector const & pTitles, CollectionInfoCollection const & pCollection) : + CollectionInfoSlot(std::string const & pName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, bool pNotifyScriptOnModify, int pSlotIdIndex, int pBeginSlotId, int pAbsoluteBeginSlotId, int pEndSlotId, int pAbsoluteEndSlotId, unsigned long pMaxSlotValue, unsigned long pMaxValueForNumBits, std::vector const & pCategories, std::vector const & pPrereqs, std::string const & pMusic, std::vector const & pTitles, CollectionInfoCollection const & pCollection) : name(pName), icon(pIcon), showIfNotYetEarned(pShowIfNotYetEarned), hidden(pHidden), notifyScriptOnModify(pNotifyScriptOnModify), slotIdIndex(pSlotIdIndex), beginSlotId(pBeginSlotId), absoluteBeginSlotId(pAbsoluteBeginSlotId), endSlotId(pEndSlotId), absoluteEndSlotId(pAbsoluteEndSlotId), counterTypeSlot(pEndSlotId > 0), maxSlotValue(pMaxSlotValue), maxValueForNumBits(pMaxValueForNumBits), categories(pCategories), prereqsPtr(), music(pMusic), titles(pTitles), collection(pCollection), prereqs(pPrereqs) {}; std::string const name; @@ -141,36 +141,36 @@ public: static CollectionsDataTable::CollectionInfoSlot const * isASlotTitle(std::string const & titleName); // collections - static stdvector::fwd const & getSlotsInCollection(std::string const & collectionName); + static std::vector const & getSlotsInCollection(std::string const & collectionName); static std::vector const & getAllTitleableCollections(); static CollectionsDataTable::CollectionInfoCollection const * isACollectionTitle(std::string const & titleName); - static stdmap::fwd const & getAllServerFirstCollections(); + static std::map const & getAllServerFirstCollections(); static CollectionsDataTable::CollectionInfoCollection const * getCollectionByName(std::string const & collectionName); // pages - static stdvector::fwd const & getSlotsInPage(std::string const & pageName); - static stdvector::fwd const & getCollectionsInPage(std::string const & pageName); + static std::vector const & getSlotsInPage(std::string const & pageName); + static std::vector const & getCollectionsInPage(std::string const & pageName); static std::vector const & getAllTitleablePages(); static CollectionsDataTable::CollectionInfoPage const * isAPageTitle(std::string const & titleName); static CollectionsDataTable::CollectionInfoPage const * getPageByName(std::string const & pageName); // books - static stdvector::fwd const & getSlotsInBook(std::string const & bookName); - static stdvector::fwd const & getCollectionsInBook(std::string const & bookName); - static stdvector::fwd const & getPagesInBook(std::string const & bookName); - static stdvector::fwd const & getAllBooks(); + static std::vector const & getSlotsInBook(std::string const & bookName); + static std::vector const & getCollectionsInBook(std::string const & bookName); + static std::vector const & getPagesInBook(std::string const & bookName); + static std::vector const & getAllBooks(); static CollectionsDataTable::CollectionInfoBook const * getBookByName(std::string const & bookName); // categories - static stdvector::fwd const & getSlotsInCategory(std::string const & categoryName); - static stdvector::fwd const & getSlotsInCategoryByCollection(std::string const & collectionName, std::string const & categoryName); - static stdvector::fwd const & getSlotsInCategoryByPage(std::string const & pageName, std::string const & categoryName); - static stdvector::fwd const & getSlotsInCategoryByBook(std::string const & bookName, std::string const & categoryName); + static std::vector const & getSlotsInCategory(std::string const & categoryName); + static std::vector const & getSlotsInCategoryByCollection(std::string const & collectionName, std::string const & categoryName); + static std::vector const & getSlotsInCategoryByPage(std::string const & pageName, std::string const & categoryName); + static std::vector const & getSlotsInCategoryByBook(std::string const & bookName, std::string const & categoryName); - static stdset::fwd const & getAllSlotCategoriesInCollection(std::string const & collectionName); - static stdset::fwd const & getAllSlotCategoriesInPage(std::string const & pageName); - static stdset::fwd const & getAllSlotCategoriesInBook(std::string const & bookName); - static stdset::fwd const & getAllSlotCategories(); + static std::set const & getAllSlotCategoriesInCollection(std::string const & collectionName); + static std::set const & getAllSlotCategoriesInPage(std::string const & pageName); + static std::set const & getAllSlotCategoriesInBook(std::string const & bookName); + static std::set const & getAllSlotCategories(); // misc static Unicode::String localizeCollectionName(std::string const & name); @@ -179,7 +179,7 @@ public: static char const * getShowIfNotYetEarnedTypeString(ShowIfNotYetEarnedType const showIfNotYetEarned); // "server first" processing - static void setServerFirstData(stdset, std::pair > >::fwd const & collectionServerFirst); + static void setServerFirstData(std::set, std::pair > > const & collectionServerFirst); private: // disabled diff --git a/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.h b/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.h index 5ae6ee30..edc0c523 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.h +++ b/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.h @@ -49,10 +49,10 @@ public: SearchAttribute &operator =(SearchAttribute const &); }; - static stdmap::fwd const & getSearchAttributeForGameObjectType(int gameObjectType); + static std::map const & getSearchAttributeForGameObjectType(int gameObjectType); static CommoditiesAdvancedSearchAttribute::SearchAttribute const * getSearchAttribute(int gameObjectType, std::string const & attributeName); - static stdmap::fwd const & getSearchAttributeNameAliasesForGameObjectType(int gameObjectType); + static std::map const & getSearchAttributeNameAliasesForGameObjectType(int gameObjectType); static bool allowChildGameObjectTypeToInheritSearchAttribute(int gameObjectType); diff --git a/engine/shared/library/sharedGame/src/shared/core/CraftingData.cpp b/engine/shared/library/sharedGame/src/shared/core/CraftingData.cpp index d6fed7dc..692831b3 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CraftingData.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/CraftingData.cpp @@ -209,7 +209,7 @@ const std::string & Crafting::getResourceAttributeName (int attr) const StringId & Crafting::getResourceAttributeNameStringId (int attr) { - typedef stdmap::fwd ResourceAttributeNameStringIds; + typedef std::map ResourceAttributeNameStringIds; static ResourceAttributeNameStringIds sids; const ResourceAttributeNameStringIds::iterator it = sids.find (attr); diff --git a/engine/shared/library/sharedGame/src/shared/core/CraftingData.h b/engine/shared/library/sharedGame/src/shared/core/CraftingData.h index 7eb2dcad..94c38d7d 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CraftingData.h +++ b/engine/shared/library/sharedGame/src/shared/core/CraftingData.h @@ -147,7 +147,7 @@ namespace Crafting CraftingType_Last = CT_mission, }; - typedef stdvector::fwd StringVector; + typedef std::vector StringVector; void getCraftingTypeNames (uint32 types, StringVector & sv); //------------------------------------------------------------------------------ @@ -229,8 +229,8 @@ namespace Crafting IngredientSlot(enum IngredientType _ingredientType, const StringId & _name, - const stdvector::fwd &slotIngredients, - const stdvector::fwd &slotIngredientsCount, + const std::vector &slotIngredients, + const std::vector &slotIngredientsCount, float _complexity, int _draftSlotOption, int _draftSlotIndex); diff --git a/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.h b/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.h index 316e7fc1..40cf4b72 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.h @@ -93,8 +93,8 @@ public: static std::string const cms_shared_owner_no_slash; static std::string const cms_priv; - typedef stdvector::fwd CustomizationVector; - typedef stdmap::fwd CustomizationSpeciesMap; + typedef std::vector CustomizationVector; + typedef std::map CustomizationSpeciesMap; static void install(); static void remove(); @@ -113,7 +113,7 @@ public: static std::string convertServerHairTemplateNameToSharedHairTemplateName(std::string const &serverHairTemplateName); static PaletteColumns getPaletteColumnDataShortName(std::string const & paletteName); static PaletteColumns getPaletteColumnDataLongName(std::string const & paletteName); - static stdmap::fwd const & getPaletteColumnData(); + static std::map const & getPaletteColumnData(); static bool isHoloemoteName(std::string const & holoemoteName); static int const getRequiredHairSkillForHoloemote(std::string const & holoemoteName); diff --git a/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp b/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp index 4c2b7a17..df23f913 100755 --- a/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp @@ -26,7 +26,7 @@ namespace DraftSchematicGroupManagerNamespace { typedef DraftSchematicGroupManager::StringVector StringVector; typedef DraftSchematicGroupManager::SchematicVector SchematicVector; - typedef stdmap::fwd GroupMapping; + typedef std::map GroupMapping; GroupMapping s_groupMapping; bool s_installed = false; diff --git a/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.h b/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.h index 84d93d87..42aec132 100755 --- a/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.h @@ -14,8 +14,8 @@ class DraftSchematicGroupManager { public: - typedef stdvector::fwd StringVector; - typedef stdvector >::fwd SchematicVector; + typedef std::vector StringVector; + typedef std::vector > SchematicVector; static void getGroups (StringVector & sv); static bool getSchematicsForGroup (const std::string & group, SchematicVector & sv); diff --git a/engine/shared/library/sharedGame/src/shared/core/FormManager.h b/engine/shared/library/sharedGame/src/shared/core/FormManager.h index 19ac513a..1c7fa4b3 100755 --- a/engine/shared/library/sharedGame/src/shared/core/FormManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/FormManager.h @@ -20,7 +20,7 @@ class FormManager { public: typedef Unicode::String PackedFormData; - typedef stdmap::fwd >::fwd UnpackedFormData; + typedef std::map > UnpackedFormData; //the various types of fields that the form can support enum FieldType @@ -65,17 +65,17 @@ public: bool isFloatType() const; bool isStringType() const; bool isArrayType() const; - bool isValidValue(std::string const & value, stdmap::fwd const & pendingData, std::string & errorString /*OUT*/) const; - bool isValidValue(int value, stdmap::fwd const & pendingData, std::string & errorString /*OUT*/) const; - bool isValidValue(float value, stdmap::fwd const & pendingData, std::string & errorString /*OUT*/) const; - int getMinimumIntValue(stdmap::fwd const & pendingData, std::string & validationField /*OUT*/) const; - int getMaximumIntValue(stdmap::fwd const & pendingData, std::string & validationField /*OUT*/) const; - float getMinimumFloatValue(stdmap::fwd const & pendingData, std::string & validationField /*OUT*/) const; - float getMaximumFloatValue(stdmap::fwd const & pendingData, std::string & validationField /*OUT*/) const; + bool isValidValue(std::string const & value, std::map const & pendingData, std::string & errorString /*OUT*/) const; + bool isValidValue(int value, std::map const & pendingData, std::string & errorString /*OUT*/) const; + bool isValidValue(float value, std::map const & pendingData, std::string & errorString /*OUT*/) const; + int getMinimumIntValue(std::map const & pendingData, std::string & validationField /*OUT*/) const; + int getMaximumIntValue(std::map const & pendingData, std::string & validationField /*OUT*/) const; + float getMinimumFloatValue(std::map const & pendingData, std::string & validationField /*OUT*/) const; + float getMaximumFloatValue(std::map const & pendingData, std::string & validationField /*OUT*/) const; std::string const & getName() const; std::string const & getExternalName() const; - stdvector::fwd const & getOtherValidationRules() const; + std::vector const & getOtherValidationRules() const; std::string const & getDefaultValue() const; std::string const & getObjvarBinding() const; @@ -93,11 +93,11 @@ public: std::string m_maximumValue; bool m_minimumValueSet; bool m_maximumValueSet; - stdvector::fwd * m_choices; + std::vector * m_choices; bool m_mustUseList; std::string m_validationFilename; int m_validationFilenameColumn; - stdvector::fwd * m_otherValidationRules; + std::vector * m_otherValidationRules; Form const * m_parentForm; std::string m_objvarBinding; }; @@ -113,7 +113,7 @@ public: bool isNameOfField(std::string const & fieldName) const; Field const * getField(std::string const & fieldName) const; std::string const & getName() const; - stdvector::fwd const & getOrderedFieldList() const; + std::vector const & getOrderedFieldList() const; Form(); virtual ~Form(); @@ -124,8 +124,8 @@ public: private: std::string m_name; - stdmap::fwd* m_fields; - stdvector::fwd* m_orderedFieldList; + std::map* m_fields; + std::vector* m_orderedFieldList; }; //This is an "abstract" static manager, which is instanciated by clientGame/FormManagerClient and serverGame/FormManagerServer @@ -155,13 +155,13 @@ private: private: //this map OWNS the Form pointers - static stdmap::fwd * ms_forms; + static std::map * ms_forms; //this map hold pointers to Forms, but does NOT own them - static stdmap::fwd * ms_serverObjectTemplateToForms; + static std::map * ms_serverObjectTemplateToForms; //this map hold pointers to Forms, but does NOT own them - static stdmap::fwd * ms_sharedObjectTemplateToForms; + static std::map * ms_sharedObjectTemplateToForms; //this map stores whether a particular server template was mapped for an "auto-object-creating" form in formmap.tab - static stdmap::fwd * ms_automaticallyCreateObjectForServerObjectTemplate; + static std::map * ms_automaticallyCreateObjectForServerObjectTemplate; }; //====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/core/GameLanguageManager.h b/engine/shared/library/sharedGame/src/shared/core/GameLanguageManager.h index d4f3b031..3906826e 100755 --- a/engine/shared/library/sharedGame/src/shared/core/GameLanguageManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/GameLanguageManager.h @@ -15,7 +15,7 @@ class GameLanguageManager { public: - typedef stdvector::fwd StringVector; + typedef std::vector StringVector; static void install(); diff --git a/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.cpp b/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.cpp index 4e23e9c0..f682f799 100755 --- a/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.cpp @@ -473,8 +473,8 @@ bool GameObjectTypes::isSubType (int type) bool GameObjectTypes::doesPowerupApply (int powerupType, int targetType) { //@todo: this should be data driven - typedef stdvector::fwd IntVector; - typedef stdmap::fwd IntVectorMap; + typedef std::vector IntVector; + typedef std::map IntVectorMap; static IntVectorMap s_powerupGotMap; static bool s_powerupGotMapInstalled = false; if (!s_powerupGotMapInstalled) diff --git a/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.h b/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.h index bbd51b23..cacc3096 100755 --- a/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.h +++ b/engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.h @@ -18,10 +18,10 @@ class GameObjectTypes { public: - typedef stdmap::fwd TypeStringIdMap; - typedef stdmap::fwd TypeStringMap; - typedef stdmap::fwd StringTypeMap; - typedef stdmap::fwd TypeUnicodeStringMap; + typedef std::map TypeStringIdMap; + typedef std::map TypeStringMap; + typedef std::map StringTypeMap; + typedef std::map TypeUnicodeStringMap; static const TypeStringMap & getTypeStringMap (); @@ -41,7 +41,7 @@ public: static bool doesPowerupApply (int powerupType, int targetType); static bool isExcludedFromCommodities(int type); - static stdmap::fwd const & getTypesExcludedFromCommodities(); + static std::map const & getTypesExcludedFromCommodities(); static const int ms_type_mask; }; diff --git a/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.h b/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.h index 3905427f..4a3f6362 100755 --- a/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.h @@ -33,7 +33,7 @@ public: static Vector getDirectionToHyperspacePoint_w(std::string const & fromSceneName, Vector const & fromLocation_w, std::string const & toSceneName, Vector const & toLocation_w); static bool isValidHyperspacePoint(std::string const & hyperspacePointName); static bool getHyperspacePoint(std::string const & hyperspacePointName, HyperspaceLocation & /*OUT*/ location); - static bool getHyperspacePoints(std::string const & sceneName, stdvector::fwd & /*OUT*/ locations); + static bool getHyperspacePoints(std::string const & sceneName, std::vector & /*OUT*/ locations); static std::string getHomeLocationHyperspacePointName(); static bool isValidSceneForHomeLocationHyperspace(std::string const & sceneName); diff --git a/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h b/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h index 2357d177..ff4cf5af 100755 --- a/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h +++ b/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h @@ -53,7 +53,7 @@ public: static LfgCharacterData::Profession convertSkillTemplateToProfession(const std::string & skillTemplate); static std::string getProfessionDebugString(LfgCharacterData::Profession profession); static Unicode::String const & getProfessionDisplayString(LfgCharacterData::Profession profession); - static stdmap::fwd const & calculateStatistics(stdmap::fwd const & connectedCharacterLfgData); + static std::map const & calculateStatistics(std::map const & connectedCharacterLfgData); std::string getDebugString() const; diff --git a/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h b/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h index 5ffc3e70..c78e3b55 100755 --- a/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h +++ b/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h @@ -86,7 +86,7 @@ public: }; static std::vector const & getTopLevelLfgNodes(); - static stdmap::fwd const & getAllLfgLeafNodes(); + static std::map const & getAllLfgLeafNodes(); static LfgNode const * getLfgNodeByName(std::string const & lfgNodeName); static LfgNode const * getLfgLeafNodeByName(std::string const & lfgNodeName); diff --git a/engine/shared/library/sharedGame/src/shared/core/MoodManager.cpp b/engine/shared/library/sharedGame/src/shared/core/MoodManager.cpp index 295bd40d..633c547b 100755 --- a/engine/shared/library/sharedGame/src/shared/core/MoodManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/MoodManager.cpp @@ -20,8 +20,8 @@ namespace { - typedef stdmap::fwd IntStringMap; - typedef stdmap::fwd StringIntMap; + typedef std::map IntStringMap; + typedef std::map StringIntMap; IntStringMap s_idToNameMap; StringIntMap s_nameToIdMap; diff --git a/engine/shared/library/sharedGame/src/shared/core/MoodManager.h b/engine/shared/library/sharedGame/src/shared/core/MoodManager.h index f41f5d89..658f04f2 100755 --- a/engine/shared/library/sharedGame/src/shared/core/MoodManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/MoodManager.h @@ -18,7 +18,7 @@ class MoodManager { public: - typedef stdmap::fwd StringIntMap; + typedef std::map StringIntMap; static void install (); static void remove (); diff --git a/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.h b/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.h index f36e4a14..e3f14538 100755 --- a/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.h +++ b/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.h @@ -25,8 +25,8 @@ class OutOfBandPackager { public: - typedef stdvector::fwd OutOfBandBaseVector; - typedef stdvector >::fwd AttributeVector; + typedef std::vector OutOfBandBaseVector; + typedef std::vector > AttributeVector; enum OobTypes { diff --git a/engine/shared/library/sharedGame/src/shared/core/PlanetMapManager.cpp b/engine/shared/library/sharedGame/src/shared/core/PlanetMapManager.cpp index c05674c5..a4bcc251 100755 --- a/engine/shared/library/sharedGame/src/shared/core/PlanetMapManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/PlanetMapManager.cpp @@ -21,12 +21,12 @@ namespace PlanetMapManagerNamespace { - typedef stdmap::fwd TypeNameMap; - typedef stdmap::fwd NameTypeMap; - typedef stdmap::fwd TypeStringIdMap; + typedef std::map TypeNameMap; + typedef std::map NameTypeMap; + typedef std::map TypeStringIdMap; typedef std::pair FactionAndVisibility; - typedef stdmap::fwd TypeFactionMap; + typedef std::map TypeFactionMap; TypeNameMap s_typeNameMap; NameTypeMap s_nameTypeMap; diff --git a/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp b/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp index 200a2f9f..63a4882c 100755 --- a/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp @@ -600,7 +600,7 @@ bool PlayerCreationManager::getRacialTotal(const std::string & sharedTemplateNam //---------------------------------------------------------------------- -bool PlayerCreationManager::test (std::string & result, const stdvector::fwd & templateNames) +bool PlayerCreationManager::test (std::string & result, const std::vector & templateNames) { DEBUG_FATAL (!s_installed, ("not installed.\n")); UNREF (result); diff --git a/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.h b/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.h index a7335cb4..02af9bb2 100755 --- a/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.h @@ -26,22 +26,22 @@ public: EqInfo (int32 i, const std::string & a, const std::string & b); }; - typedef stdvector::fwd SkillVector; - typedef stdvector::fwd EqVector; - typedef stdvector::fwd StringVector; - typedef stdvector::fwd AttribVector; - typedef stdmap::fwd ProfessionAttribMap; + typedef std::vector SkillVector; + typedef std::vector EqVector; + typedef std::vector StringVector; + typedef std::vector AttribVector; + typedef std::map ProfessionAttribMap; static void clear (); static void init (); - static bool test (std::string & result, const stdvector::fwd & templateNames); + static bool test (std::string & result, const std::vector & templateNames); static void getProfessionVector (StringVector & sv, const std::string & categoryName); - static bool getRacialModifiers (const std::string& sharedTemplateName, stdvector::fwd & /*OUT*/ modifiers); - static bool getProfessionModifiers (const std::string& profession, stdvector::fwd & /*OUT*/modifiers); - static bool getRacialMinMaxes (const std::string& sharedTemplateName, stdvector >::fwd & /*OUT*/ minMaxes); + static bool getRacialModifiers (const std::string& sharedTemplateName, std::vector & /*OUT*/ modifiers); + static bool getProfessionModifiers (const std::string& profession, std::vector & /*OUT*/modifiers); + static bool getRacialMinMaxes (const std::string& sharedTemplateName, std::vector > & /*OUT*/ minMaxes); static bool getRacialTotal (const std::string& sharedTemplateName, int & /*OUT*/ total); protected: @@ -60,10 +60,10 @@ private: static void buildRacialMinsMaxes (); private: - static stdmap::fwd >::fwd m_racialModifiers; - static stdmap::fwd >::fwd m_professionModifiers; - static stdmap >::fwd >::fwd m_racialMinMaxes; - static stdmap::fwd m_racialTotals; + static std::map > m_racialModifiers; + static std::map > m_professionModifiers; + static std::map > > m_racialMinMaxes; + static std::map m_racialTotals; }; //====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp b/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp index c567d82d..d9cc0c7e 100755 --- a/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp @@ -26,10 +26,10 @@ namespace bool useRadialTarget; }; - typedef stdmap::fwd RangeMap; + typedef std::map RangeMap; RangeMap s_ranges; - typedef stdmap::fwd NameMap; + typedef std::map NameMap; NameMap s_names; bool s_installed = false; diff --git a/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.h b/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.h index 3392afe8..527f3706 100755 --- a/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.h @@ -18,7 +18,7 @@ class RadialMenuManager { public: - typedef stdvector::fwd DataVector; + typedef std::vector DataVector; static int getMenuTypeByName (const std::string & name); static bool getRangeForMenuType (int menuType, float &range); diff --git a/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h b/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h index c373f4c9..b74523d9 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h @@ -58,7 +58,7 @@ public: std::string m_requiredExpertise; }; - typedef stdmap::fwd BuffBuilderDataType; + typedef std::map BuffBuilderDataType; static BuffBuilderDataType* ms_buffBuilderData; public: diff --git a/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.h b/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.h index 521ac2f8..174cd34e 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.h @@ -100,7 +100,7 @@ class SharedBuildoutAreaManager { public: - typedef stdvector::fwd BuildoutAreaVector; + typedef std::vector BuildoutAreaVector; typedef std::pair StringPair; static bool isBuildoutScene(std::string const & sceneName); diff --git a/engine/shared/library/sharedGame/src/shared/core/SocialsManager.cpp b/engine/shared/library/sharedGame/src/shared/core/SocialsManager.cpp index 3fff1513..dc6f2bf8 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SocialsManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/SocialsManager.cpp @@ -21,8 +21,8 @@ namespace { - typedef stdmap::fwd IntStringMap; - typedef stdmap::fwd StringIntMap; + typedef std::map IntStringMap; + typedef std::map StringIntMap; IntStringMap s_idToNameMap; StringIntMap s_nameToIdMap; diff --git a/engine/shared/library/sharedGame/src/shared/core/SocialsManager.h b/engine/shared/library/sharedGame/src/shared/core/SocialsManager.h index e89d20f1..2e8ca643 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SocialsManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/SocialsManager.h @@ -14,7 +14,7 @@ class SocialsManager { public: - typedef stdmap::fwd StringIntMap; + typedef std::map StringIntMap; static void install (); static void remove (); diff --git a/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.cpp b/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.cpp index 7e502210..2caaf62d 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.cpp @@ -21,11 +21,11 @@ namespace SpatialChatManagerNamespace { - typedef stdmap::fwd IntStringMap; - typedef stdmap::fwd StringIntMap; - typedef stdmap::fwd IntShortMap; - typedef stdset::fwd IntSet; - typedef stdmap >::fwd IntStringVectorMap; + typedef std::map IntStringMap; + typedef std::map StringIntMap; + typedef std::map IntShortMap; + typedef std::set IntSet; + typedef std::map > IntStringVectorMap; IntStringMap s_idToNameMap; StringIntMap s_nameToIdMap; @@ -150,7 +150,7 @@ uint16 SpatialChatManager::getVolume (uint32 type) //---------------------------------------------------------------------- -const stdvector::fwd &SpatialChatManager::getSkillsProviding(uint32 type) +const std::vector &SpatialChatManager::getSkillsProviding(uint32 type) { const IntStringVectorMap::const_iterator it = s_skillsProviding.find(type); if (it != s_skillsProviding.end()) diff --git a/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.h b/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.h index 2bfb722d..037aa098 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.h +++ b/engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.h @@ -19,7 +19,7 @@ public: static uint32 getChatTypeByName (const std::string & name); static uint32 getDefaultChatType (); static bool getChatNameByType (uint32 type, std::string & name); - static const stdvector::fwd & getSkillsProviding (uint32 type); + static const std::vector & getSkillsProviding (uint32 type); static bool isPrivate (uint32 type); static uint16 getVolume (uint32 type); diff --git a/engine/shared/library/sharedGame/src/shared/core/Universe.h b/engine/shared/library/sharedGame/src/shared/core/Universe.h index 32cad7ea..2f2403e8 100755 --- a/engine/shared/library/sharedGame/src/shared/core/Universe.h +++ b/engine/shared/library/sharedGame/src/shared/core/Universe.h @@ -28,7 +28,7 @@ class Universe ResourceClassObject * getResourceClassByName (const std::string &name) const; ResourceClassObject * getResourceClassByNameCrc (uint32 nameCrc) const; void registerResourceClassObject (ResourceClassObject &newClass); - virtual void resourceClassTreeLoaded (stdmap::fwd &resourceClasses) = 0; + virtual void resourceClassTreeLoaded (std::map &resourceClasses) = 0; virtual ResourceClassObject * makeResourceClassObject () = 0; bool derivesFromResource (const std::string & base, const std::string & leaf) const; @@ -37,8 +37,8 @@ class Universe // // Resource Class Objects // - typedef stdmap::fwd ResourceClassNameMap; - typedef stdmap::fwd ResourceClassNameCrcMap; + typedef std::map ResourceClassNameMap; + typedef std::map ResourceClassNameCrcMap; ResourceClassNameMap * m_resourceClassNameMap; ResourceClassNameCrcMap * m_resourceClassNameCrcMap; ResourceClassObject * m_resourceTreeRoot; diff --git a/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.h b/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.h index 2bdb4eef..b89a1f60 100755 --- a/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.h +++ b/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.h @@ -40,7 +40,7 @@ public: B_anonymous = 127 }; - typedef stdvector::fwd IntVector; + typedef std::vector IntVector; MatchMakingId(); diff --git a/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h b/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h index 1361de6e..25a5ff7e 100755 --- a/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h +++ b/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h @@ -23,7 +23,7 @@ class StringId; class ResourceClassObject { public: - typedef stdmap >::fwd ResourceAttributeRangesType; + typedef std::map > ResourceAttributeRangesType; public: ResourceClassObject(); @@ -32,7 +32,7 @@ public: static void install(); static void remove(); static bool isClassExcludedFromCommodities(std::string const & className); - static stdset::fwd const & getClassesExcludedFromCommodities(); + static std::set const & getClassesExcludedFromCommodities(); public: // getter functions @@ -49,8 +49,8 @@ public: void getCrateTemplate (std::string &buffer) const; int getMinTypes () const; int getMaxTypes () const; - void getChildren (stdvector::fwd & children, bool recurse) const; - void getLeafChildren (stdvector::fwd & children) const; + void getChildren (std::vector & children, bool recurse) const; + void getLeafChildren (std::vector & children) const; int getMinPools () const; int getMaxPools () const; bool isRecycled () const; @@ -82,7 +82,7 @@ protected: ResourceAttributeRangesType * m_resourceAttributeRanges; protected: - typedef stdvector::fwd ClassList; + typedef std::vector ClassList; ClassList * m_children; private: diff --git a/engine/shared/library/sharedGame/src/shared/object/SlopeEffectProperty.h b/engine/shared/library/sharedGame/src/shared/object/SlopeEffectProperty.h index 4ba6df6d..a8f9a00c 100755 --- a/engine/shared/library/sharedGame/src/shared/object/SlopeEffectProperty.h +++ b/engine/shared/library/sharedGame/src/shared/object/SlopeEffectProperty.h @@ -46,7 +46,7 @@ private: // ====================================================================== -inline const stdvector::fwd & SlopeEffectProperty::getNormals() const +inline const std::vector & SlopeEffectProperty::getNormals() const { return m_normals; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h index a4b2fc1a..be6de3b2 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h @@ -199,10 +199,10 @@ protected: private: // this enum is also defined in the server object_template.tdf file // this enum is also defined in the server object_template.tdf file - stdvector::fwd m_slots; // ingredient slots + std::vector m_slots; // ingredient slots bool m_slotsLoaded; bool m_slotsAppend; - stdvector::fwd m_attributes; // what attributes the schematic can affect + std::vector m_attributes; // what attributes the schematic can affect bool m_attributesLoaded; bool m_attributesAppend; StringParam m_craftedSharedTemplate; diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h index 7cd54f53..be5ebe7e 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h @@ -291,25 +291,25 @@ protected: virtual void load(Iff &file); private: - stdvector::fwd m_paletteColorCustomizationVariables; // // all palette color customization variables exposed by an Object created with this template + std::vector m_paletteColorCustomizationVariables; // // all palette color customization variables exposed by an Object created with this template bool m_paletteColorCustomizationVariablesLoaded; bool m_paletteColorCustomizationVariablesAppend; - stdvector::fwd m_rangedIntCustomizationVariables; // // all ranged-int style customization variables exposed by an Object created with this template + std::vector m_rangedIntCustomizationVariables; // // all ranged-int style customization variables exposed by an Object created with this template bool m_rangedIntCustomizationVariablesLoaded; bool m_rangedIntCustomizationVariablesAppend; - stdvector::fwd m_constStringCustomizationVariables; // // constant string values added to the Object's customization data, not persisted in the DB + std::vector m_constStringCustomizationVariables; // // constant string values added to the Object's customization data, not persisted in the DB bool m_constStringCustomizationVariablesLoaded; bool m_constStringCustomizationVariablesAppend; - stdvector::fwd m_socketDestinations; // // GOTs that this object can be socketed into + std::vector m_socketDestinations; // // GOTs that this object can be socketed into bool m_socketDestinationsLoaded; bool m_socketDestinationsAppend; StringParam m_structureFootprintFileName; BoolParam m_useStructureFootprintOutline; BoolParam m_targetable; // // can the object be targetted by the client - stdvector::fwd m_certificationsRequired; // // List of the certifications required to use this item (used in x1 only) + std::vector m_certificationsRequired; // // List of the certifications required to use this item (used in x1 only) bool m_certificationsRequiredLoaded; bool m_certificationsRequiredAppend; - stdvector::fwd m_customizationVariableMapping; // // Allows remapping of variables when needed + std::vector m_customizationVariableMapping; // // Allows remapping of variables when needed bool m_customizationVariableMappingLoaded; bool m_customizationVariableMappingAppend; IntegerParam m_clientVisabilityFlag; // // can the object be viewed on the client diff --git a/engine/shared/library/sharedGame/src/shared/quest/Quest.h b/engine/shared/library/sharedGame/src/shared/quest/Quest.h index 44f7ad7b..bebf42c5 100755 --- a/engine/shared/library/sharedGame/src/shared/quest/Quest.h +++ b/engine/shared/library/sharedGame/src/shared/quest/Quest.h @@ -33,8 +33,8 @@ public: public: bool isRepeatable() const; bool isVisible() const; - stdvector::fwd const & getPrerequisiteQuests() const; - stdvector::fwd const & getExclusionQuests() const; + std::vector const & getPrerequisiteQuests() const; + std::vector const & getExclusionQuests() const; int getNumberOfTasks() const; QuestTask const * getTask(int taskId) const; CrcString const & getName() const; @@ -64,9 +64,9 @@ private: StringId m_journalEntryTitle; StringId m_journalEntryDescription; StringId m_journalEntryCompetionSummary; - stdvector::fwd * const m_prerequisiteQuests; - stdvector::fwd * const m_exclusionQuests; - stdvector::fwd * const m_tasks; + std::vector * const m_prerequisiteQuests; + std::vector * const m_exclusionQuests; + std::vector * const m_tasks; bool m_allowRepeats; bool m_visible; StringId m_category; diff --git a/engine/shared/library/sharedGame/src/shared/quest/QuestTask.h b/engine/shared/library/sharedGame/src/shared/quest/QuestTask.h index 3fd3844f..25289b64 100755 --- a/engine/shared/library/sharedGame/src/shared/quest/QuestTask.h +++ b/engine/shared/library/sharedGame/src/shared/quest/QuestTask.h @@ -24,7 +24,7 @@ class Quest; class QuestTask { public: - typedef stdvector::fwd TaskIdList; + typedef std::vector TaskIdList; enum QuestControl { diff --git a/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp b/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp index 2fabba5e..be37913e 100755 --- a/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp @@ -340,7 +340,7 @@ bool AsteroidGenerationManager::hasDataForScene(std::string const & sceneName) The same seed data will always generate the same asteroid field. The field will have randomly even distribution of position, orientation, rotation range, scale range, and template selection based on the ratios given in the fields style table */ -bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldData, stdvector::fwd & result) +bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldData, std::vector & result) { if(!s_installed) { diff --git a/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.h b/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.h index a299e1c2..6c64a309 100755 --- a/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.h +++ b/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.h @@ -76,13 +76,13 @@ public: public: static void install(); - static bool generateField(AsteroidFieldData const & fieldData, stdvector::fwd & result); - static bool generateField(Vector const & centerPosition, float radius, int count, uint32 seed, float scaleMin, float scaleMax, float rotationMin, float rotationMax, stdvector >::fwd const & templateCrcsAndLikelihood, stdvector::fwd & asteroidDatas); + static bool generateField(AsteroidFieldData const & fieldData, std::vector & result); + static bool generateField(Vector const & centerPosition, float radius, int count, uint32 seed, float scaleMin, float scaleMax, float rotationMin, float rotationMax, std::vector > const & templateCrcsAndLikelihood, std::vector & asteroidDatas); static void loadStaticFieldDataForScene(std::string const & sceneName, bool server); static void clearStaticFieldData(); static void clearInstantiatedData(); static bool hasDataForScene(std::string const & sceneName); - static stdvector::fwd const & getDataForScene(std::string const & sceneName); + static std::vector const & getDataForScene(std::string const & sceneName); static void registerGetExtentRadiusFunction(GetExtentRadiusFunction); private: @@ -99,7 +99,7 @@ private: private: typedef std::string SceneNameKey; - static stdmap::fwd>::fwd ms_staticFieldData; + static std::map> ms_staticFieldData; static SphereTree ms_collisionSphereTree; static std::vector ms_objectsInSphereTree; static GetExtentRadiusFunction ms_getRadiusFunction; diff --git a/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp b/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp index e48dc276..4a3daedc 100755 --- a/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp @@ -25,7 +25,7 @@ namespace NebulaManagerNamespace { typedef NebulaManager::NebulaVector NebulaVector; - typedef stdmap::fwd NebulaMap; + typedef std::map NebulaMap; typedef std::map NebulasByScene; //-- nebula vector OWNS the nebulas diff --git a/engine/shared/library/sharedGame/src/shared/space/NebulaManager.h b/engine/shared/library/sharedGame/src/shared/space/NebulaManager.h index 07f53385..29cc88ef 100755 --- a/engine/shared/library/sharedGame/src/shared/space/NebulaManager.h +++ b/engine/shared/library/sharedGame/src/shared/space/NebulaManager.h @@ -21,7 +21,7 @@ public: typedef void (*ImplementationClearFunction) (void); - typedef stdvector::fwd NebulaVector; + typedef std::vector NebulaVector; static void install(); static void remove(); diff --git a/engine/shared/library/sharedGame/src/shared/space/PlayerFormationManager.h b/engine/shared/library/sharedGame/src/shared/space/PlayerFormationManager.h index 8c77d464..9180783c 100755 --- a/engine/shared/library/sharedGame/src/shared/space/PlayerFormationManager.h +++ b/engine/shared/library/sharedGame/src/shared/space/PlayerFormationManager.h @@ -19,7 +19,7 @@ class PlayerFormationManager { public: - typedef stdvector::fwd FormationNameList; + typedef std::vector FormationNameList; struct FormationLocation; public: diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp index 6d014f13..1db00929 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp @@ -28,8 +28,8 @@ namespace ShipChassisNamespace { - typedef stdmap::fwd NameChassisMap; - typedef stdmap::fwd CrcChassisMap; + typedef std::map NameChassisMap; + typedef std::map CrcChassisMap; typedef ShipChassis::PersistentCrcStringVector PersistentCrcStringVector; PersistentCrcStringVector * s_shipChassisNameVector; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h b/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h index 2ff80838..ffc28698 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassis.h @@ -21,10 +21,10 @@ class ShipChassis { public: - typedef stdvector::fwd SlotVector; - typedef stdset::fwd SlotSet; - typedef stdvector::fwd IntVector; - typedef stdvector::fwd StringVector; + typedef std::vector SlotVector; + typedef std::set SlotSet; + typedef std::vector IntVector; + typedef std::vector StringVector; static void install (); static void remove (); @@ -34,7 +34,7 @@ public: static void setUseWritableChassis(bool onlyUseThisForTools); - typedef stdvector::fwd PersistentCrcStringVector; + typedef std::vector PersistentCrcStringVector; static PersistentCrcStringVector const & getShipChassisCrcVector (); diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp index 0830d52c..ac5d4bf3 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp @@ -31,7 +31,7 @@ namespace ShipChassisSlotNamespace //---------------------------------------------------------------------- - typedef stdvector::fwd CompatibilityVector; + typedef std::vector CompatibilityVector; //---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h index 9642ef34..3a92f9f3 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h @@ -20,7 +20,7 @@ class ShipComponentDescriptor; class ShipChassisSlot { public: - typedef stdvector::fwd CompatibilityVector; + typedef std::vector CompatibilityVector; ShipChassisSlot (ShipChassisSlotType::Type slotType, std::string const & compatibilities, int hitWeight, bool targetable); ShipChassisSlot (); diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp index 47024992..ef379099 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp @@ -273,7 +273,7 @@ namespace ShipChassisSlotTypeNamespace static_cast(ShipComponentType::SCT_weapon), // SCST_weapon_99 }; - typedef stdunordered_map::fwd SlotNameTypeMap; + typedef std::unordered_map SlotNameTypeMap; SlotNameTypeMap s_slotNameTypeMap; bool s_installed = false; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp index 3a8dbd52..938851ca 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp @@ -79,7 +79,7 @@ namespace ShipComponentAttachmentManagerNamespace } }; - typedef stdmap::fwd AttachmentMap; + typedef std::map AttachmentMap; AttachmentMap * s_attachmentMap; typedef std::map ComponentHitRangeMap; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.h b/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.h index 0ca935dd..002bc502 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.h +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.h @@ -34,8 +34,8 @@ public: static bool saveChassisInfo(std::string const & chassisName, std::string const & chassisFilenameTab, std::string const & chassisFilenameIff); typedef std::pair TemplateHardpointPair; - typedef stdvector::fwd TemplateHardpointPairVector; - typedef stdvector::fwd HardpointVector; + typedef std::vector TemplateHardpointPairVector; + typedef std::vector HardpointVector; static TemplateHardpointPairVector const & getAttachmentsForShip (uint32 chassisCrc, uint32 componentCrc, int chassisSlotType); static bool getAttachmentsForShip(uint32 chassisCrc, uint32 componentCrc, TemplateHardpointPairVector const ** thpVectors); diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h b/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h index 87ee4c48..d25fc25e 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h @@ -25,7 +25,7 @@ class ShipComponentData public: typedef std::pair AttributePair; - typedef stdvector::fwd AttributeVector; + typedef std::vector AttributeVector; explicit ShipComponentData (ShipComponentDescriptor const & shipComponentDescriptor); virtual ~ShipComponentData () = 0; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp index b9e021b4..3652d29a 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp @@ -29,9 +29,9 @@ namespace ShipComponentDescriptorNamespace { - typedef stdmap::fwd NameComponentMap; - typedef stdmap::fwd CrcComponentMap; - typedef stdmap::fwd ObjectTemplateCrcComponentMap; + typedef std::map NameComponentMap; + typedef std::map CrcComponentMap; + typedef std::map ObjectTemplateCrcComponentMap; //-- the s_nameComponentMap owns the ShipComponentDescriptor objects NameComponentMap * s_nameComponentMap; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h index f2792969..7fda1fe8 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h @@ -21,8 +21,8 @@ class ShipComponentDescriptor { public: - typedef stdvector::fwd StringVector; - typedef stdmap::fwd NameComponentMap; + typedef std::vector StringVector; + typedef std::map NameComponentMap; static void install (); static void fetchSharedObjectTemplates(); diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp index a13af943..502cd5e0 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp @@ -48,7 +48,7 @@ namespace ShipComponentTypeNamespace "mod_" }; - typedef stdunordered_map::fwd ComponentNameTypeMap; + typedef std::unordered_map ComponentNameTypeMap; ComponentNameTypeMap s_componentNameTypeMap; bool s_installed = false; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp index f929434c..0720a1f8 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp @@ -55,7 +55,7 @@ namespace ShipComponentWeaponManagerNamespace } }; - typedef stdmap::fwd CrcIntMap; + typedef std::map CrcIntMap; CrcIntMap s_dataMap; bool s_installed = false; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipTargeting.h b/engine/shared/library/sharedGame/src/shared/space/ShipTargeting.h index 189a1f1d..e962faf4 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipTargeting.h +++ b/engine/shared/library/sharedGame/src/shared/space/ShipTargeting.h @@ -19,7 +19,7 @@ class ShipTargeting { public: - typedef stdvector::fwd ObjectVector; + typedef std::vector ObjectVector; typedef bool (*ActorAndTargetHaveReletionship)(Object const * actor, Object const * target); diff --git a/engine/shared/library/sharedGame/src/shared/sui/SuiCommand.h b/engine/shared/library/sharedGame/src/shared/sui/SuiCommand.h index 25b4f1aa..daff1e27 100755 --- a/engine/shared/library/sharedGame/src/shared/sui/SuiCommand.h +++ b/engine/shared/library/sharedGame/src/shared/sui/SuiCommand.h @@ -38,9 +38,9 @@ public: SCT_addDataSource, }; - typedef stdvector::fwd UnicodeStringVector; - typedef stdvector::fwd StringVector; - typedef stdvector::fwd WidgetPropertyVector; + typedef std::vector UnicodeStringVector; + typedef std::vector StringVector; + typedef std::vector WidgetPropertyVector; public: diff --git a/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h b/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h index d29703a7..76bf1030 100755 --- a/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h +++ b/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h @@ -29,7 +29,7 @@ class SuiPageData { public: - typedef stdvector::fwd SuiCommandVector; + typedef std::vector SuiCommandVector; public: diff --git a/engine/shared/library/sharedGame/src/shared/travel/TravelManager.h b/engine/shared/library/sharedGame/src/shared/travel/TravelManager.h index 01415b1c..9a515d7a 100755 --- a/engine/shared/library/sharedGame/src/shared/travel/TravelManager.h +++ b/engine/shared/library/sharedGame/src/shared/travel/TravelManager.h @@ -22,7 +22,7 @@ public: static bool getPlanetName (int planetIndex, std::string& planetName); static bool getPlanetSingleHopCost (const std::string& planetName1, const std::string& planetName2, int& planetCost); static bool getPlanetAnyHopLeastCost (const std::string& planetName1, const std::string& planetName2, int& planetCost); - static bool getAdjacentPlanets (const std::string& planetName, stdset::fwd& planetSet); + static bool getAdjacentPlanets (const std::string& planetName, std::set& planetSet); }; // ====================================================================== diff --git a/engine/shared/library/sharedImage/src/shared/ImageFormatList.h b/engine/shared/library/sharedImage/src/shared/ImageFormatList.h index b59076c1..072d5362 100755 --- a/engine/shared/library/sharedImage/src/shared/ImageFormatList.h +++ b/engine/shared/library/sharedImage/src/shared/ImageFormatList.h @@ -36,8 +36,8 @@ private: private: - typedef stdvector::fwd ImageFormatVector; - typedef stdmap::fwd ExtensionMap; + typedef std::vector ImageFormatVector; + typedef std::map ExtensionMap; private: diff --git a/engine/shared/library/sharedLog/src/shared/LogObserver.h b/engine/shared/library/sharedLog/src/shared/LogObserver.h index 60555c04..da110afa 100755 --- a/engine/shared/library/sharedLog/src/shared/LogObserver.h +++ b/engine/shared/library/sharedLog/src/shared/LogObserver.h @@ -38,7 +38,7 @@ private: LogObserver(LogObserver const &); LogObserver &operator=(LogObserver const &); - stdvector::fwd* m_filters; + std::vector* m_filters; }; // ====================================================================== diff --git a/engine/shared/library/sharedLog/src/shared/NetLogObserver.h b/engine/shared/library/sharedLog/src/shared/NetLogObserver.h index 14023e7a..1fc86b28 100755 --- a/engine/shared/library/sharedLog/src/shared/NetLogObserver.h +++ b/engine/shared/library/sharedLog/src/shared/NetLogObserver.h @@ -56,8 +56,8 @@ private: NetLogConnection * m_connection; bool m_connectionOpen; unsigned long m_connectTime; - stdvector::fwd* m_logMessageQueue1; - stdvector::fwd* m_logMessageQueue2; + std::vector* m_logMessageQueue1; + std::vector* m_logMessageQueue2; }; // ====================================================================== diff --git a/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.h b/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.h index 433278f2..9c3c7c2e 100755 --- a/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.h +++ b/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.h @@ -51,7 +51,7 @@ private: int m_fileIndex; int m_numLines; - stdvector::fwd *m_textBuffer; + std::vector *m_textBuffer; int m_nextTextBufferEntry; }; diff --git a/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.h b/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.h index 766fd2b7..9c974731 100755 --- a/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.h +++ b/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.h @@ -19,8 +19,8 @@ class CompressedQuaternion { public: - typedef stdvector::fwd QuaternionVector; - typedef stdvector::fwd CompressedQuaternionVector; + typedef std::vector QuaternionVector; + typedef std::vector CompressedQuaternionVector; public: diff --git a/engine/shared/library/sharedMath/src/shared/IndexedTriangleList.h b/engine/shared/library/sharedMath/src/shared/IndexedTriangleList.h index 9c43c4f5..57205e52 100755 --- a/engine/shared/library/sharedMath/src/shared/IndexedTriangleList.h +++ b/engine/shared/library/sharedMath/src/shared/IndexedTriangleList.h @@ -24,11 +24,11 @@ public: explicit IndexedTriangleList(Iff &iff); ~IndexedTriangleList(); - const stdvector::fwd &getVertices() const; - const stdvector::fwd &getIndices() const; + const std::vector &getVertices() const; + const std::vector &getIndices() const; - stdvector::fwd &getVertices(); - stdvector::fwd &getIndices(); + std::vector &getVertices(); + std::vector &getIndices(); void load(Iff &iff); void write(Iff &iff) const; @@ -48,7 +48,7 @@ public: void copy(const IndexedTriangleList *tris); bool collide(Vector const & start, Vector const & end, Vector & result) const; - bool collide(Vector const & start, Vector const & end, stdvector::fwd const & indices, Vector & result) const; + bool collide(Vector const & start, Vector const & end, std::vector const & indices, Vector & result) const; private: @@ -60,14 +60,14 @@ private: void load_0000(Iff &iff); - void addVertices(const Vector *vertices, int numberOfVertices, stdvector::fwd &indices); + void addVertices(const Vector *vertices, int numberOfVertices, std::vector &indices); private: bool m_mergeVertices; float m_epsilon; - stdvector::fwd * const m_vertices; - stdvector::fwd * const m_indices; + std::vector * const m_vertices; + std::vector * const m_indices; }; // ====================================================================== diff --git a/engine/shared/library/sharedMath/src/shared/PaletteArgb.h b/engine/shared/library/sharedMath/src/shared/PaletteArgb.h index 4df62ae0..ad7ae310 100755 --- a/engine/shared/library/sharedMath/src/shared/PaletteArgb.h +++ b/engine/shared/library/sharedMath/src/shared/PaletteArgb.h @@ -58,7 +58,7 @@ public: public: explicit PaletteArgb(int entryCount); - explicit PaletteArgb(stdvector::fwd const & packedArgbVector); + explicit PaletteArgb(std::vector const & packedArgbVector); const CrcString &getName() const; @@ -77,7 +77,7 @@ public: private: - typedef stdvector::fwd PackedArgbVector; + typedef std::vector PackedArgbVector; private: diff --git a/engine/shared/library/sharedMath/src/shared/PaletteArgbList.h b/engine/shared/library/sharedMath/src/shared/PaletteArgbList.h index f064f7a8..85ec5a7b 100755 --- a/engine/shared/library/sharedMath/src/shared/PaletteArgbList.h +++ b/engine/shared/library/sharedMath/src/shared/PaletteArgbList.h @@ -38,7 +38,7 @@ public: private: - typedef stdmap::fwd ResourceMap; + typedef std::map ResourceMap; private: diff --git a/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h b/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h index 31b2a843..e686edfd 100755 --- a/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h +++ b/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h @@ -19,7 +19,7 @@ class PositionVertexIndexer { public: - typedef stdvector::fwd VectorVector; + typedef std::vector VectorVector; PositionVertexIndexer(); ~PositionVertexIndexer(); diff --git a/engine/shared/library/sharedMath/src/shared/SpatialSubdivision.h b/engine/shared/library/sharedMath/src/shared/SpatialSubdivision.h index 4aba185d..0039afcc 100755 --- a/engine/shared/library/sharedMath/src/shared/SpatialSubdivision.h +++ b/engine/shared/library/sharedMath/src/shared/SpatialSubdivision.h @@ -81,10 +81,10 @@ public: virtual ~SpatialSubdivision () = 0; virtual SpatialSubdivisionHandle * addObject (ObjectType object) = 0; virtual const bool canSee (SpatialSubdivisionHandle * target, const Vector & start, const float distance, const float fov=0.0f) const = 0; //lint !e1735 // virtual function has default parameter - virtual void findInRange (const Vector & origin, const float distance, typename stdvector::fwd & results) const = 0; - virtual void findInRange (const Vector & origin, const float distance, const SpatialSubdivisionFilter &filter, typename stdvector::fwd & results) const = 0; - virtual void findOnRay (const Vector & begin, const Vector & dir, typename stdvector::fwd & results) const = 0; - virtual void findOnSegment (const Vector & begin, const Vector & end, typename stdvector::fwd & results) const = 0; + virtual void findInRange (const Vector & origin, const float distance, typename std::vector & results) const = 0; + virtual void findInRange (const Vector & origin, const float distance, const SpatialSubdivisionFilter &filter, typename std::vector & results) const = 0; + virtual void findOnRay (const Vector & begin, const Vector & dir, typename std::vector & results) const = 0; + virtual void findOnSegment (const Vector & begin, const Vector & end, typename std::vector & results) const = 0; virtual void move (SpatialSubdivisionHandle * object) = 0; virtual void removeObject (SpatialSubdivisionHandle * object) = 0; diff --git a/engine/shared/library/sharedMath/src/shared/Vector.h b/engine/shared/library/sharedMath/src/shared/Vector.h index 60f76432..badc1a14 100755 --- a/engine/shared/library/sharedMath/src/shared/Vector.h +++ b/engine/shared/library/sharedMath/src/shared/Vector.h @@ -125,7 +125,7 @@ public: // const Vector refract(const Vector &normal, real n1, real n2); bool inPolygon (const Vector& v0, const Vector& v1, const Vector& v2) const; - bool inPolygon (const stdvector::fwd &convexPolygonVertices) const; + bool inPolygon (const std::vector &convexPolygonVertices) const; public: diff --git a/engine/shared/library/sharedMath/src/shared/core/AxialBox.h b/engine/shared/library/sharedMath/src/shared/core/AxialBox.h index 83fc6a18..0ed0a943 100755 --- a/engine/shared/library/sharedMath/src/shared/core/AxialBox.h +++ b/engine/shared/library/sharedMath/src/shared/core/AxialBox.h @@ -18,7 +18,7 @@ class AxialBox { public: - typedef stdvector::fwd VertexList; + typedef std::vector VertexList; public: diff --git a/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.h b/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.h index 7ff847a0..90be0977 100755 --- a/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.h +++ b/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.h @@ -21,7 +21,7 @@ class Vector; class Object; class Transform; -typedef stdvector::fwd VectorVec; +typedef std::vector VectorVec; class DebugShapeRenderer { diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp index 959f0dab..5fc2c922 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp @@ -10,7 +10,7 @@ //----------------------------------------------------------------------- -ChatInviteGroupMembersToRoom::ChatInviteGroupMembersToRoom(const NetworkId & i, const ChatAvatarId & g, const std::string & r, const stdvector::fwd & m) : +ChatInviteGroupMembersToRoom::ChatInviteGroupMembersToRoom(const NetworkId & i, const ChatAvatarId & g, const std::string & r, const std::vector & m) : GameNetworkMessage("ChatInviteGroupMembersToRoom"), invitorNetworkId(i), groupLeaderId(g), diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h index 3f204fda..160f5dc1 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h @@ -17,14 +17,14 @@ class ChatInviteGroupMembersToRoom : public GameNetworkMessage { public: - ChatInviteGroupMembersToRoom(const NetworkId & invitor, const ChatAvatarId & groupLeaderId, const std::string & roomName, const stdvector::fwd & members); + ChatInviteGroupMembersToRoom(const NetworkId & invitor, const ChatAvatarId & groupLeaderId, const std::string & roomName, const std::vector & members); explicit ChatInviteGroupMembersToRoom(Archive::ReadIterator & source); ~ChatInviteGroupMembersToRoom(); const NetworkId & getInvitorNetworkId() const; const ChatAvatarId & getGroupLeaderId () const; const std::string & getRoomName () const; - const stdvector::fwd & getInvitedMembers () const; + const std::vector & getInvitedMembers () const; private: ChatInviteGroupMembersToRoom & operator = (const ChatInviteGroupMembersToRoom & rhs); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h index d4a5deb6..4ed105f9 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h @@ -212,10 +212,10 @@ public: void setLocation(const Vector& v); int getParent() const; void setParent(int p); - const stdvector::fwd& getChildren() const; - void setChildren(const stdvector::fwd& c); - const stdvector::fwd& getSiblings() const; - void setSiblings(const stdvector::fwd& c); + const std::vector& getChildren() const; + void setChildren(const std::vector& c); + const std::vector& getSiblings() const; + void setSiblings(const std::vector& c); int getType() const; void setType(int t); int getLevel() const; @@ -348,8 +348,8 @@ public: NetworkId const &getObjectId() const; void setObjectId(NetworkId const & pathId); - stdvector::fwd const &getNodes() const; - void setNodes(stdvector::fwd const &n); + std::vector const &getNodes() const; + void setNodes(std::vector const &n); private: Archive::AutoVariable m_objectId; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h index aad15008..7b366f53 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h @@ -24,7 +24,7 @@ public: static const char * const MessageType; typedef std::pair AttributePair; - typedef stdvector::fwd AttributeVector; + typedef std::vector AttributeVector; AttributeListMessage(NetworkId const & id, AttributeVector const & data, int const revision); AttributeListMessage(std::string const & staticItemName, AttributeVector const & data, int const revision); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h index 21b43a0c..7a21ce47 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h @@ -26,8 +26,8 @@ public: static const char * const MessageType; - typedef stdvector::fwd AuctionHeaderVector; - typedef stdvector::fwd PalettizedAuctionHeaderVector; + typedef std::vector AuctionHeaderVector; + typedef std::vector PalettizedAuctionHeaderVector; AuctionQueryHeadersResponseMessage(int requestId, int typeFlag, AuctionHeaderVector const &auctionData, uint16 queryOffset, bool hasMorePages); explicit AuctionQueryHeadersResponseMessage(Archive::ReadIterator &source); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h index bc251b40..75c43b64 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h @@ -40,7 +40,7 @@ class AuctionQueryResponseMessage : public GameNetworkMessage { public: typedef AuctionQueryResponse_AuctionData AuctionData; - typedef stdvector::fwd AuctionDataVector; + typedef std::vector AuctionDataVector; AuctionQueryResponseMessage(int requestId, int typeFlag, AuctionDataVector const &auctionData); explicit AuctionQueryResponseMessage(Archive::ReadIterator &source); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h index 229a2b64..6d02b0c6 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h @@ -21,8 +21,8 @@ public: explicit ExpertiseRequestMessage(Archive::ReadIterator &source); virtual ~ExpertiseRequestMessage(); - stdvector::fwd const &getAddExpertisesList() const; - void setAddExpertisesList(stdvector::fwd const &addExpertisesList); + std::vector const &getAddExpertisesList() const; + void setAddExpertisesList(std::vector const &addExpertisesList); bool getClearAllExpertisesFirst() const; void setClearAllExpertisesFirst(bool clearAllExpertisesFirst); @@ -38,7 +38,7 @@ private: // ---------------------------------------------------------------------- -inline stdvector::fwd const &ExpertiseRequestMessage::getAddExpertisesList() const +inline std::vector const &ExpertiseRequestMessage::getAddExpertisesList() const { return m_addExpertisesList.get(); } diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h index 129b4b94..028221ae 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h @@ -26,7 +26,7 @@ public: static const char * const MessageType; - FactionResponseMessage(int rebel, int imperial, int criminal, const stdvector::fwd & npcFactionNameList, const stdvector::fwd & npcFactionValueList); + FactionResponseMessage(int rebel, int imperial, int criminal, const std::vector & npcFactionNameList, const std::vector & npcFactionValueList); explicit FactionResponseMessage(Archive::ReadIterator & source); virtual ~FactionResponseMessage(); @@ -34,8 +34,8 @@ public: int getFactionRebel () const; int getFactionImperial() const; int getFactionCriminal() const; - const stdvector::fwd & getNPCFactionNames() const; - const stdvector::fwd & getNPCFactionValues() const; + const std::vector & getNPCFactionNames() const; + const std::vector & getNPCFactionValues() const; private: Archive::AutoVariable m_factionRebelValue; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h index 19c3f6f2..6c005330 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h @@ -26,7 +26,7 @@ public: static const char * const MessageType; - typedef stdvector::fwd MapLocationVector; + typedef std::vector MapLocationVector; GetMapLocationsResponseMessage (const std::string &planetName, const MapLocationVector & locStatic, const MapLocationVector & locDynamic, const MapLocationVector & locPersist, int versionStatic, int versionDynamic, int versionPersist); explicit GetMapLocationsResponseMessage (Archive::ReadIterator &source); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h index 39acc351..fc20e10c 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h @@ -26,7 +26,7 @@ class MessageQueueDraftSchematics : public MessageQueue::Data public: typedef MessageQueueDraftSchematicsData SchematicData; - typedef stdvector::fwd SchematicVector; + typedef std::vector SchematicVector; public: diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h index 4cb0740b..e5dd3f59 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h @@ -38,7 +38,7 @@ public: int getSlotCount(void) const; const Slot & getSlot(int index) const; - typedef stdvector::fwd SlotVector; + typedef std::vector SlotVector; const SlotVector & getSlots() const; void setSlots(const SlotVector & sv); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h index 9fe29f99..9fa8a2fb 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h @@ -21,7 +21,7 @@ class MessageQueueDraftSlotsData { public: typedef MessageQueueDraftSlotsDataOption Option; - typedef stdvector