Merge branch 'testing'

engine/server/application/CentralServer/src/shared/UniverseManager.h

@@ -36,7 +36,7 @@ private:
 	void sendUniverseToServer(uint32 gameServerId);
 
 private:
-	typedef stdset<uint32>::fwd ServersLoadingUniverseType;
+	typedef std::set<uint32> ServersLoadingUniverseType;
 
 	uint32 m_universeProcess;  ///< Process that owns the universe objects
 	bool m_databaseAuthoritative; ///< True if database is authoritative for the universe objects

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<NetworkId>::fwd & members)
+void ChatServer::inviteGroupMembers(const NetworkId & id, const ChatAvatarId & avatarId, const std::string & roomName, const std::vector<NetworkId> & 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());
 

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<NetworkId>::fwd & members);
+	static void       inviteGroupMembers        (const NetworkId & id, const ChatAvatarId & avatar, const std::string & roomName, const std::vector<NetworkId> & 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);

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<int, std::string>::fwd const & excludedGotTypes);
-	void    VerifyExcludedResourceClasses (stdset<std::string>::fwd const & excludedResourceClasses);
-	void    SetResourceTreeHierarchy      (stdmap<int, stdset<int>::fwd>::fwd const & resourceTreeHierarchy);
+	void    VerifyExcludedGotTypes        (std::map<int, std::string> const & excludedGotTypes);
+	void    VerifyExcludedResourceClasses (std::set<std::string> const & excludedResourceClasses);
+	void    SetResourceTreeHierarchy      (std::map<int, std::set<int>> const & resourceTreeHierarchy);
 	bool    HasReceivedResourceTreeHierarchy() const {return !m_resourceTreeHierarchy.empty();}
 
 	std::map<std::string, int> const & getAuctionsCountByGameObjectType() const { return m_auctionsCountByGameObjectType; }

engine/server/application/CommoditiesServer/src/shared/dBBidRecord.h

@@ -30,7 +30,7 @@ struct BidRecord
 
 // ======================================================================
 
-typedef stdvector<BidRecord>::fwd BidList;
+typedef std::vector<BidRecord> BidList;
 
 // ======================================================================
 

engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h

@@ -37,9 +37,9 @@ private:
 		int                         m_pendingTicketCount;
 	};
 
-	typedef stdunordered_map<NetworkId, ClientInfo, NetworkId::Hash>::fwd ClientConnectionMap;
-	typedef stdmap<unsigned int, NetworkId>::fwd                     SuidToNetworkIdMap;
-	typedef stdvector<CustomerServiceCategory>::fwd                  CategoryList;
+	typedef std::unordered_map<NetworkId, ClientInfo, NetworkId::Hash> ClientConnectionMap;
+	typedef std::map<unsigned int, NetworkId>                     SuidToNetworkIdMap;
+	typedef std::vector<CustomerServiceCategory>                  CategoryList;
 
 	CategoryList * const m_englishCategoryList;
 	CSAssistGameAPITrack m_englishCategoryTrack;

engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.h

@@ -34,7 +34,7 @@ private:
 
 	//typedefs
 
-	typedef stdset<ConnectionServerConnection *>::fwd ConnectionServerSet;
+	typedef std::set<ConnectionServerConnection *> ConnectionServerSet;
 	typedef std::multimap<unsigned long, Unicode::String> SortedChatLog;
 
 	//Member variables
@@ -65,7 +65,7 @@ private:
 		bool                      m_gameServerChatLogReceived;
 	};
 
-	typedef stdmap<unsigned int, PendingTicket>::fwd  PendingTicketList;
+	typedef std::map<unsigned int, PendingTicket>  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);

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<std::string>::fwd const & getCharacterCreationDisabledClusterList();
+	static              std::set<std::string> const & getCharacterCreationDisabledClusterList();
 
 	static const int	getMaxConnectionsPerIP();
 

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<uint32>::fwd result);
+	void                     getClusterIds       (std::vector<uint32> result);
 	void                     performAccountTransfer (const AvatarList &avatars, TransferAccountData * transferAccountData);
 	void                     setDone             (const bool isDone);
 	

engine/server/application/PlanetServer/src/shared/PlanetProxyObject.h

@@ -84,7 +84,7 @@ class PlanetProxyObject
 	void   updateContentsTracking      (const NetworkId & newContainedBy);
 
   private:
-	typedef stdvector<std::pair<uint32, GameNetworkMessage*> > MessageListType;
+	typedef std::vector<std::pair<uint32, GameNetworkMessage*> > MessageListType;
 
   private:
 	const NetworkId m_objectId;
@@ -98,7 +98,7 @@ class PlanetProxyObject
 	int             m_objectTypeTag;
 	Node *  m_quadtreeNode;
 	unsigned long   m_authTransferTimeMs;
-	stdvector<NetworkId>::fwd * m_contents;
+	std::vector<NetworkId> * m_contents;
 	int             m_level;
 	bool            m_hibernating;
 	uint32          m_templateCrc;

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<uint32, GameServerData>::fwd &counts) const;
+	void                 getObjectCountsForAllServers(std::map<uint32, GameServerData> &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<PreloadServerId, GameServerSpawnDelaySeconds>::fwd * m_pendingServerStarts; // number of game servers to start when central & task manager are ready
-	stdmap<int, std::pair<std::string, time_t> >::fwd * m_startingGameServers; // number of game servers we've started that haven't connected to us yet
+	std::map<PreloadServerId, GameServerSpawnDelaySeconds> * m_pendingServerStarts; // number of game servers to start when central & task manager are ready
+	std::map<int, std::pair<std::string, time_t> > * 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<const GameNetworkMessage *> m_messagesWaitingForGameServer;
 	PlanetServerMetricsData*                m_metricsData;
 	TaskConnection*                         m_taskManagerConnection;
-	stdlist<const RequestSceneTransfer *>::fwd *m_sceneTransferChunkLoads;
-	stdmap<NetworkId, uint32>::fwd          *m_pendingCharacterSaves;
+	std::list<const RequestSceneTransfer *> *m_sceneTransferChunkLoads;
+	std::map<NetworkId, uint32>          *m_pendingCharacterSaves;
 
 	WatcherList m_watchers;
 	bool m_watcherIsPresent;
 
 	typedef std::map<NetworkId, std::vector<GameNetworkMessage*> > QueuedMessagesType;
 	QueuedMessagesType m_queuedMessages;
-	stdmap<NetworkId, CharacterFindInfo>::fwd *m_characterFindMap;
+	std::map<NetworkId, CharacterFindInfo> *m_characterFindMap;
 	unsigned int m_characterFindSequence;
 	int          m_waitForSaveCounter;
 	int          m_lastSaveCounter;

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<uint32, unsigned long>::fwd m_gameServerLoadTime;
+	std::map<uint32, unsigned long> m_gameServerLoadTime;
 
 private:
 

engine/server/application/PlanetServer/src/shared/PreloadManager.h

@@ -58,7 +58,7 @@ class PreloadManager : public Singleton2<PreloadManager>
 	uint32 getRealServerId       (PreloadServerId preloadServerId) const;
 	void getDebugString          (std::string &output) const;
 
-	typedef stdmap<PreloadServerId, PreloadServerInformation>::fwd ServerMapType;
+	typedef std::map<PreloadServerId, PreloadServerInformation> ServerMapType;
 	ServerMapType const * getServerMap () const;
 	
   private:
@@ -67,10 +67,10 @@ class PreloadManager : public Singleton2<PreloadManager>
   private:
 	ServerMapType *m_serverMap; // map of server id in preload list ---> actual server id
 
-	typedef stdvector<PreloadListData>::fwd PreloadListType;
+	typedef std::vector<PreloadListData> PreloadListType;
 	PreloadListType *m_preloadList;
 
-	typedef stdset<PreloadServerId>::fwd ServersWaitingType;
+	typedef std::set<PreloadServerId> ServersWaitingType;
 	ServersWaitingType *m_serversWaiting; // set of servers (by list id, not actual id) that still need preloads.
 
 	bool m_listReceived;

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<PlanetProxyObject*>::fwd &subscriptionFixups);
+	void         handleCrash       (uint32 crashedServer, std::vector<PlanetProxyObject*> &subscriptionFixups);
 	void         load              ();
 	void         migrateToServer   (uint32 newServerId);
 	void         load              (uint32 serverId);

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<uint32>::fwd &servers, const stdvector<int>::fwd &subscriptionCounts)
+void WatcherConnection::addNodeUpdate(int x, int z, bool loaded, const std::vector<uint32> &servers, const std::vector<int> &subscriptionCounts)
 {
 	NOT_NULL(m_nodeData);	
 	m_nodeData->push_back(PlanetNodeStatusMessageData(x,z,loaded,servers,subscriptionCounts));

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<uint32>::fwd &servers, const stdvector<int>::fwd &subscriptionCounts);
+	void addNodeUpdate   (int x, int z, bool loaded, const std::vector<uint32> &servers, const std::vector<int> &subscriptionCounts);
 	void flushQueuedData ();
 
   private:
@@ -34,10 +34,10 @@ class WatcherConnection : public ServerConnection
 	void flushQueuedNodeData();
 		
   private:
-	typedef stdvector<PlanetObjectStatusMessageData>::fwd ObjectDataList;
+	typedef std::vector<PlanetObjectStatusMessageData> ObjectDataList;
 	ObjectDataList *m_objectData;
 
-	typedef stdvector<PlanetNodeStatusMessageData>::fwd NodeDataList;
+	typedef std::vector<PlanetNodeStatusMessageData> NodeDataList;
 	NodeDataList *m_nodeData;
 
   private:

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<std::string, std::string>::fwd const & getClosedConnections();
+	static std::map<std::string, std::string> const & getClosedConnections();
 };
 
 // ======================================================================

engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.h

@@ -25,7 +25,7 @@ class NetworkId;
 
 namespace DB
 {
-	typedef stdset<Tag>::fwd TagSet;
+	typedef std::set<Tag> TagSet;
 }
 
 // ======================================================================

engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp

@@ -34,14 +34,14 @@ void ConfigServerDatabase::install(void)
 	ConfigServerUtility::install();
 	data = &staticData;
 
-	KEY_INT     (objvarNameCleanupTime, 10);
-	KEY_INT     (orphanedObjectCleanupTime, 10);
-	KEY_INT     (marketAttributesCleanupTime, 10);
-	KEY_INT     (messagesCleanupTime, 10);
-	KEY_INT     (brokenObjectCleanupTime, 10);
-	KEY_INT     (vendorObjectCleanupTime, 10);
+	KEY_INT     (objvarNameCleanupTime, 0);
+	KEY_INT     (orphanedObjectCleanupTime, 0);
+	KEY_INT     (marketAttributesCleanupTime, 0);
+	KEY_INT     (messagesCleanupTime, 0);
+	KEY_INT     (brokenObjectCleanupTime, 0);
+	KEY_INT     (vendorObjectCleanupTime, 0);
 	KEY_STRING  (customSQLFilename,"");
-	KEY_BOOL    (enableFixBadCells, true);
+	KEY_BOOL    (enableFixBadCells, false);
 	KEY_STRING  (objectTemplateListUpdateFilename,"");
 
 	KEY_STRING  (DSN,"gameserver");
@@ -56,7 +56,7 @@ void ConfigServerDatabase::install(void)
 	KEY_INT     (taskManagerPort, 60001);
 	KEY_INT     (expectedDBVersion, 270);
 	KEY_BOOL    (correctDBVersionRequired,true);
-	KEY_INT     (saveFrequencyLimit,5);
+	KEY_INT     (saveFrequencyLimit,0);
 	KEY_STRING  (schemaOwner, "");
 	KEY_STRING  (goldSchemaOwner, "");
 	KEY_FLOAT   (uniqueMessageCacheTimeSec, 30.0f);

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<uint32>::fwd &processIds) const;
+	void getGameServerProcessIds(std::vector<uint32> &processIds) const;
 	uint32 getProcessId(void);
 	DB::Server *getDBServer(void);
 	const std::string &getClusterName() const;

engine/server/library/serverDatabase/src/shared/GameServerConnection.h

@@ -27,7 +27,7 @@ public:
 	void clearChunkCompleteQueue();
 
 private:
-	typedef stdvector<std::pair<int, int> >::fwd ChunkCompleteQueueType;
+	typedef std::vector<std::pair<int, int> > ChunkCompleteQueueType;
 	ChunkCompleteQueueType * const m_chunkCompleteQueue;
 	
 private:

engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.h

@@ -28,7 +28,7 @@ class ImmediateDeleteCustomPersistStep : public CustomPersistStep
 	void addObject             (const NetworkId &deletedObject);
 	
   private:
-	stdset<NetworkId>::fwd     *m_objects; // using set instead of vector to enforce uniqueness
+	std::set<NetworkId>     *m_objects; // using set instead of vector to enforce uniqueness
 
   private:
 	ImmediateDeleteCustomPersistStep &operator= (const ImmediateDeleteCustomPersistStep&); //disable

engine/server/library/serverDatabase/src/shared/LazyDeleter.h

@@ -53,8 +53,8 @@ class LazyDeleter
   private:
 	static LazyDeleter *ms_instance;
 	Thread *m_workerThread;
-	stdvector<NetworkId>::fwd *m_incomingObjects;
-	stddeque<NetworkId>::fwd *m_objectsToDelete;
+	std::vector<NetworkId> *m_incomingObjects;
+	std::deque<NetworkId> *m_objectsToDelete;
 	Mutex *m_objectListLock;
 	bool m_shutdown;
 	bool m_paused;

engine/server/library/serverDatabase/src/shared/MessageToManager.h

@@ -27,7 +27,7 @@ class GameServerConnection;
 class MessageToManager
 {
   public:
-	typedef stdvector<MessageToPayload>::fwd MessageVector;
+	typedef std::vector<MessageToPayload> MessageVector;
 
   public:
 	static void install();

engine/server/library/serverDatabase/src/shared/Persister.cpp

@@ -5,6 +5,8 @@
 //
 // ======================================================================
 
+#include <memory>
+
 #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;
@@ -354,10 +338,10 @@ void Persister::startSave(void)
 		taskQueue->asyncRequest(new TaskSaveSnapshot(i->second));
 	}
 	for (i=m_newObjectSnapshots.begin(); i!=m_newObjectSnapshots.end(); ++i)
-        {
-                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() )
@@ -617,23 +601,13 @@ void Persister::endBaselines(const NetworkId &objectId, uint32 serverId)
 
 void Persister::saveCompleted(Snapshot *completedSnapshot)
 {
-	{
-		std::lock_guard<std::mutex> lck(m_savingDeleting_mtx);
-
-		delete completedSnapshot;
-		completedSnapshot = nullptr;
-	}
-		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())
 	{
-		
-		{
-			std::lock_guard<std::mutex> lck(m_savingDeleting_mtx);
-			WARNING(true, ("m_SavingSnapshots is not empty and we're nuking everything for some reason. Is this a leak?"));
-			m_savingSnapshots.erase(i, m_savingSnapshots.end());
-		}
-	
+		m_savingSnapshots.erase(i, m_savingSnapshots.end());
+
+		delete completedSnapshot;
+
 		if (m_savingSnapshots.empty() && ConfigServerDatabase::getReportSaveTimes())
 		{
 			int saveTime = Clock::timeMs() - m_saveStartTime;
@@ -641,9 +615,10 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
 			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;
 		}
 
@@ -654,7 +629,7 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
 			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);
@@ -663,16 +638,19 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
 	}
 	else
 	{
-		std::lock_guard<std::mutex> lck(m_savingDeleting_mtx);
+		SnapshotListType::iterator j=std::remove(m_savingCharacterSnapshots.begin(),m_savingCharacterSnapshots.end(),completedSnapshot);
+
+		DEBUG_FATAL(i==m_savingCharacterSnapshots.end(),("Programmer bug:  SaveCompleted() called with a snapshot that wasn't in m_savingSnapshots or m_savingCharacterSnapshots."));
 
-		auto j=std::remove(m_savingCharacterSnapshots.begin(),m_savingCharacterSnapshots.end(),completedSnapshot);
-	
-		WARNING(j==m_savingCharacterSnapshots.end(),("saveCompleted() called w/o snap in m_savingSnapshots or m_savingCharacterSnapshots."));
-	
 		m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end());
+
+		delete completedSnapshot;
+
+		DEBUG_REPORT_LOG(ConfigServerDatabase::getReportSaveTimes(),("New character save completed\n"));
 	}
 }
 
+
 // ----------------------------------------------------------------------
 
 void Persister::receiveMessage(const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message)

engine/server/library/serverDatabase/src/shared/Persister.h

@@ -16,8 +16,6 @@
 #include <vector>
 #include <set> //TODO: remove when we clean up newCharacterLock hack
 
-#include <mutex>
-
 #include "Unicode.h"
 #include "serverNetworkMessages/MessageToPayload.h"
 #include "sharedDatabaseInterface/DbModeQuery.h"
@@ -118,12 +116,8 @@ class Persister : public MessageDispatch::Receiver
 	ServerSnapshotMap      m_newCharacterSnapshots;
 	ObjectSnapshotMap      m_objectSnapshotMap;
 	PendingCharactersType  m_pendingCharacters;
-
 	SnapshotListType       m_savingSnapshots;
 	SnapshotListType       m_savingCharacterSnapshots;
-	
-	std::mutex m_savingDeleting_mtx;
-	
 	NewCharacterLockType   m_newCharacterLock;
 	CharactersToDeleteType * m_charactersToDeleteThisSaveCycle;
 	CharactersToDeleteType * m_charactersToDeleteNextSaveCycle;
@@ -189,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<int8>::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<int8> const & packedDictionary)=0;
 
   protected:
 	Persister();

engine/server/library/serverDatabase/src/shared/Snapshot.cpp

@@ -69,31 +69,42 @@ bool Snapshot::saveToDB(DB::Session *session)
 {
 	NOT_NULL(session);
 
+	m_isBeingSaved = true;
+
 	CustomStepListType::iterator step;
 	for (step=m_customStepList.begin(); step !=m_customStepList.end(); ++step)
 	{
 		NOT_NULL(*step);
-		if (!(*step)->beforePersist(session))
+		if (!(*step)->beforePersist(session)) {
+			m_isBeingSaved = false;
 			return false;
+		}
 	}
 
 	if (m_timestamp!=0)
-		if (! saveTimestamp(session))
+		if (! saveTimestamp(session)) {
+			m_isBeingSaved = false;
 			return false;
+		}
 
 	for (BufferListType::iterator buffer=m_bufferList.begin(); buffer!=m_bufferList.end(); ++buffer)
 	{
-		if (! (*buffer)->save(session))
+		if (! (*buffer)->save(session)) {
+			m_isBeingSaved = false;
 			return false;
+		}
 	}
 
 	for (step=m_customStepList.begin(); step !=m_customStepList.end(); ++step)
 	{
 		NOT_NULL(*step);
-		if (!(*step)->afterPersist(session))
+		if (!(*step)->afterPersist(session)){
+			m_isBeingSaved = false;
 			return false;
+		}
 	}
 
+	m_isBeingSaved = false;
 	return true;
 }
 // ----------------------------------------------------------------------
@@ -105,7 +116,7 @@ bool Snapshot::saveToDB(DB::Session *session)
  * appropriate (virtual) function.
  */
 
-void Snapshot::handleDeltasMessage(NetworkId objectId, const DeltasMessage &msg)
+void Snapshot::handleDeltasMessage(NetworkId & objectId, const DeltasMessage &msg)
 {
 	unsigned char packageId=msg.getPackageId();
 	Tag typeId=msg.getTypeId();
@@ -117,40 +128,29 @@ void Snapshot::handleDeltasMessage(NetworkId objectId, const DeltasMessage &msg)
 	{
 		unsigned short int index;
 		Archive::get(bs,index);
- 		if (packageId==DeltasMessage::DELTAS_SERVER)
-		{
-			decodeServerData(objectId,typeId,index,bs,false);
-		}
-		else if (packageId==DeltasMessage::DELTAS_SHARED)
-		{
-			decodeSharedData(objectId,typeId,index,bs,false);
-		}
-		else if (packageId==DeltasMessage::DELTAS_CLIENT_SERVER)
-		{
-			decodeClientData(objectId,typeId,index,bs,false);
-		}
- 		else if (packageId==DeltasMessage::DELTAS_SERVER_NP)
-		{
-		}
-		else if (packageId==DeltasMessage::DELTAS_SHARED_NP)
-		{
-		}
-		else if (packageId==DeltasMessage::DELTAS_CLIENT_SERVER_NP)
-		{
-		}
-		else if (packageId==DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER)
-		{
-			decodeParentClientData(objectId,typeId,index,bs,false);
-		}
-		else if (packageId==DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER_NP)
-		{
-		}
-		else if (packageId==DeltasMessage::DELTAS_UI)
-		{
-		}
-		else
-		{
-			FATAL(true,("PackageId was invalid."));
+
+		switch (packageId) {
+ 			case DeltasMessage::DELTAS_SERVER:
+				decodeServerData(objectId,typeId,index,bs,false);
+				break;
+			case DeltasMessage::DELTAS_SHARED:
+				decodeSharedData(objectId,typeId,index,bs,false);
+				break;
+			case DeltasMessage::DELTAS_CLIENT_SERVER:
+				decodeClientData(objectId,typeId,index,bs,false);
+				break;
+			case DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER:
+				decodeParentClientData(objectId,typeId,index,bs,false);
+				break;
+                        case DeltasMessage::DELTAS_SERVER_NP:
+                        case DeltasMessage::DELTAS_SHARED_NP:
+                        case DeltasMessage::DELTAS_CLIENT_SERVER_NP:			
+			case DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER_NP:
+			case DeltasMessage::DELTAS_UI:
+				break;
+			default:
+				FATAL(true,("PackageId was invalid."));
+				break;
 		}
 	}
 }
@@ -164,7 +164,7 @@ void Snapshot::handleDeltasMessage(NetworkId objectId, const DeltasMessage &msg)
  * appropriate (virtual) function.
  */
 
-void Snapshot::handleBaselinesMessage(NetworkId objectId, const BaselinesMessage &msg)
+void Snapshot::handleBaselinesMessage(NetworkId &objectId, const BaselinesMessage &msg)
 {
 	unsigned char packageId=msg.getPackageId();
 	Tag typeId=msg.getTypeId();
@@ -173,41 +173,30 @@ void Snapshot::handleBaselinesMessage(NetworkId objectId, const BaselinesMessage
 	Archive::get(bs,count);
 	for (uint16 i=0; i< count; ++i)
 	{
-		if (packageId==BaselinesMessage::BASELINES_SERVER)
-		{
-			decodeServerData(objectId,typeId,i,bs,true);
-		}
-		else if (packageId==BaselinesMessage::BASELINES_SHARED)
-		{
-			decodeSharedData(objectId,typeId,i,bs,true);
-		}
-		else if (packageId==BaselinesMessage::BASELINES_CLIENT_SERVER)
-		{
-			decodeClientData(objectId,typeId,i,bs,true);
-		}
-		else if (packageId==BaselinesMessage::BASELINES_SERVER_NP)
-		{
-		}
-		else if (packageId==BaselinesMessage::BASELINES_SHARED_NP)
-		{
-		}
-		else if (packageId==BaselinesMessage::BASELINES_CLIENT_SERVER_NP)
-		{
-		}
-		else if (packageId==BaselinesMessage::BASELINES_UI)
-		{
-		}
-		else if (packageId==BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER)
-		{
-			decodeParentClientData(objectId,typeId,i,bs,true);
-		}
-		else if (packageId==BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER_NP)
-		{
-		}
-		else
-		{
-			FATAL(true,("PackageId was not BASELINES_SERVER, BASELINES_SHARED, or BASELINES_CLIENT.\n"));
-		}
+		switch (packageId){
+			case BaselinesMessage::BASELINES_SERVER :
+				decodeServerData(objectId,typeId,i,bs,true);
+				break;	
+			case BaselinesMessage::BASELINES_SHARED:
+				decodeSharedData(objectId,typeId,i,bs,true);
+				break;
+			case BaselinesMessage::BASELINES_CLIENT_SERVER :
+				decodeClientData(objectId,typeId,i,bs,true);
+				break;
+			case BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER:
+				decodeParentClientData(objectId,typeId,i,bs,true);
+				break;
+			case BaselinesMessage::BASELINES_SERVER_NP :
+			case BaselinesMessage::BASELINES_SHARED_NP :
+			case BaselinesMessage::BASELINES_CLIENT_SERVER_NP :
+			case BaselinesMessage::BASELINES_UI :
+			case BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER_NP :
+				break;	
+			default:
+				FATAL(true,("PackageId was not BASELINES_SERVER, BASELINES_SHARED, or BASELINES_CLIENT.\n"));
+				break;
+		
+		}	
 	}
 }
 
@@ -215,6 +204,7 @@ void Snapshot::handleBaselinesMessage(NetworkId objectId, const BaselinesMessage
 
 void Snapshot::addLocator(ObjectLocator *newLocator)
 {
+		
 	NOT_NULL(newLocator);
 	m_locatorList.push_back(newLocator);
 }

engine/server/library/serverDatabase/src/shared/Snapshot.h

@@ -45,16 +45,16 @@ public:
 	virtual ~Snapshot();
 	
 	virtual void handleUpdateObjectPosition(const UpdateObjectPositionMessage &msg) =0;
-	virtual void handleDeleteMessage   (const NetworkId &objectID, int reasonCode, bool immediate, bool demandLoadedContainer, bool cascadeReason) =0;
+	virtual void handleDeleteMessage   (const NetworkId & objectID, int reasonCode, bool immediate, bool demandLoadedContainer, bool cascadeReason) =0;
 	virtual void handleMessageTo       (const MessageToPayload &data) =0;
 	virtual void handleMessageToAck    (const MessageToId &messageId) =0;
 	virtual void handleAddResourceTypeMessage (const AddResourceTypeMessage &message) =0;
 	virtual void handleBountyHunterTargetMessage (const BountyHunterTargetMessage &message) =0;
 
-	virtual void getWorldContainers    (stdvector<NetworkId>::fwd &containers) const = 0;
+	virtual void getWorldContainers    (std::vector<NetworkId> &containers) const = 0;
 
-	void handleDeltasMessage           (NetworkId objectId, const DeltasMessage &msg);
-	void handleBaselinesMessage        (NetworkId objectId, const BaselinesMessage &msg);
+	void handleDeltasMessage           (NetworkId & objectId, const DeltasMessage &msg);
+	void handleBaselinesMessage        (NetworkId & objectId, const BaselinesMessage &msg);
 	
 	virtual bool saveToDB              (DB::Session *session) =0;
 	virtual bool load                  (DB::Session *session) =0;
@@ -63,8 +63,8 @@ public:
 
 	void takeTimestamp();
 
-	virtual void newObject             (NetworkId const & objectId, int templateId, Tag typeId) =0;
-//	virtual void addObjectIdForLoad    (NetworkId objectId)=0; //TODO:  the load list could be moved into Snapshot, intead of being in the derived class
+	virtual void newObject             (const NetworkId & objectId, int templateId, Tag typeId) =0;
+//	virtual void addObjectIdForLoad    (NetworkId & objectId)=0; //TODO:  the load list could be moved into Snapshot, intead of being in the derived class
 
 	void addLocator                    (ObjectLocator *newLocator);
 	void addCustomPersistStep          (CustomPersistStep *newStep);
@@ -98,13 +98,13 @@ public:
 	bool saveTimestamp (DB::Session *session);
 	
   private:
-	bool m_isBeingSaved;
 	bool m_useGoldDatabase;
 	DB::ModeQuery::Mode m_mode;
 	int m_timestamp;
 
-
 public:
+	bool m_isBeingSaved;
+	bool getIsBeingSaved();
 	static int getCreationCount() { return ms_creationCount; }
 	static int getDeletionCount() { return ms_deletionCount; }
 	static int getPendingCount() { return ms_creationCount - ms_deletionCount; }
@@ -113,15 +113,15 @@ private:
 	static int ms_deletionCount;
 
   protected:
-	virtual void decodeServerData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0;
-	virtual void decodeSharedData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0;
-	virtual void decodeClientData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0;
-	virtual void decodeParentClientData(NetworkId const & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0;
+	virtual void decodeServerData(const NetworkId & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0;
+	virtual void decodeSharedData(const NetworkId & objectId, Tag typeId, uint16 index, Archive::ReadIterator &bs, bool isBaseline) = 0;
+	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(NetworkId const & objectId, Tag typeId, stdvector<BatchBaselinesMessageData>::fwd &baselines) const = 0;
-	virtual bool encodeClientData(NetworkId const & objectId, Tag typeId, stdvector<BatchBaselinesMessageData>::fwd &baselines) const = 0;
-	virtual bool encodeServerData(NetworkId const & objectId, Tag typeId, stdvector<BatchBaselinesMessageData>::fwd &baselines) const = 0;
-	virtual bool encodeSharedData(NetworkId const & objectId, Tag typeId, stdvector<BatchBaselinesMessageData>::fwd &baselines) const = 0;
+	virtual bool encodeParentClientData(NetworkId const & objectId, Tag typeId, std::vector<BatchBaselinesMessageData> &baselines) const = 0;
+	virtual bool encodeClientData(NetworkId const & objectId, Tag typeId, std::vector<BatchBaselinesMessageData> &baselines) const = 0;
+	virtual bool encodeServerData(NetworkId const & objectId, Tag typeId, std::vector<BatchBaselinesMessageData> &baselines) const = 0;
+	virtual bool encodeSharedData(NetworkId const & objectId, Tag typeId, std::vector<BatchBaselinesMessageData> &baselines) const = 0;
 
   private:
 	Snapshot(const Snapshot&); //disable
@@ -130,6 +130,11 @@ private:
 
 // ----------------------------------------------------------------------
 
+inline bool Snapshot::getIsBeingSaved()
+{
+	return m_isBeingSaved;
+}
+
 inline void Snapshot::setUniverseAuthHack()
 {
 	m_universeAuthorityHack=true;

engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h

@@ -23,14 +23,14 @@
 class WorldContainerLocator : public ObjectLocator
 {
   public:
-	WorldContainerLocator(const stdvector<NetworkId>::fwd &containers);
+	WorldContainerLocator(const std::vector<NetworkId> &containers);
 	virtual ~WorldContainerLocator();
 	
   public:
 	virtual bool locateObjects(DB::Session *session, const std::string &schema, int &objectsLocated);
 
   private:
-	stdvector<NetworkId>::fwd * m_containers;
+	std::vector<NetworkId> * m_containers;
 
   private:
 	WorldContainerLocator &operator=(const WorldContainerLocator&); //disable

engine/server/library/serverDatabase/src/shared/dBBidRecord.h

@@ -29,7 +29,7 @@ struct BidRecord
 
 // ======================================================================
 
-typedef stdvector<BidRecord>::fwd BidList;
+typedef std::vector<BidRecord> BidList;
 
 // ======================================================================
 

engine/server/library/serverDatabase/src/shared/dBLocationRecord.h

@@ -36,7 +36,7 @@ struct LocationRecord
 
 // ======================================================================
 
-typedef stdvector<LocationRecord>::fwd LocationList;
+typedef std::vector<LocationRecord> LocationList;
 
 // ======================================================================
 

engine/server/library/serverGame/src/shared/ai/AggroListProperty.h

@@ -25,7 +25,7 @@ class AggroListProperty : public Property
 {
 public:
 
-	typedef stdset<CachedNetworkId>::fwd TargetList;
+	typedef std::set<CachedNetworkId> TargetList;
 
 	static int getAggroListPropertyResetTime();
 	static AggroListProperty * getAggroListProperty(Object & object);

engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h

@@ -20,7 +20,7 @@ public:
 
 	struct Action;
 
-	typedef stdvector<Action *>::fwd ActionList;
+	typedef std::vector<Action *> ActionList;
 
 	AiCreatureCombatProfile();
 

engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h

@@ -85,7 +85,7 @@ protected:
 		, BCR_failure
 	};
 
-	typedef stdvector<AiLocation>::fwd CachedAiLocations;
+	typedef std::vector<AiLocation> CachedAiLocations;
 
 	AiLocation m_anchor;
 	AiLocation m_target;

engine/server/library/serverGame/src/shared/ai/AiMovementMove.h

@@ -16,7 +16,7 @@ class PathGraph;
 class PortalProperty;
 class AiLocation;
 
-typedef stdvector<int>::fwd IndexList;
+typedef std::vector<int> IndexList;
 
 // ======================================================================
 // The simple move behavior moves to the waypoint, and then transitions

engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h

@@ -11,7 +11,7 @@
 
 #include "serverGame/AiMovementWaypoint.h"
 
-typedef stdlist<AiLocation>::fwd AiPath;
+typedef std::list<AiLocation> AiPath;
 class ServerPathBuilder;
 
 // ======================================================================

engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp

@@ -105,7 +105,7 @@ AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vect
 				else
 				{
 					m_patrolPath.clear();
-					WARNING(true, ("AiMovementPatrol unable to find path node %s for object %s", 
+					DEBUG_WARNING(true, ("AiMovementPatrol unable to find path node %s for object %s", 
 						Unicode::wideToNarrow(pointName).c_str(), 
 						owner->getNetworkId().getValueString().c_str()));
 					break;

engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h

@@ -58,7 +58,7 @@ public:
 
 protected:
 
-	stdvector<AiLocation>::fwd  m_patrolPath;
+	std::vector<AiLocation>  m_patrolPath;
 	bool                        m_random;
 	bool                        m_flip;
 	bool                        m_repeat;

engine/server/library/serverGame/src/shared/ai/HateList.h

@@ -27,9 +27,9 @@ class HateList
 {
 public:
 
-	typedef stdmap<CachedNetworkId, float>::fwd UnSortedList;
-	typedef stdvector<std::pair<CachedNetworkId, float> >::fwd SortedList;
-	typedef stdset<CachedNetworkId>::fwd RecentList;
+	typedef std::map<CachedNetworkId, float> UnSortedList;
+	typedef std::vector<std::pair<CachedNetworkId, float> > SortedList;
+	typedef std::set<CachedNetworkId> RecentList;
 
 	static float getMaxDistanceToTarget();
 
@@ -92,7 +92,7 @@ private:
 	Archive::AutoDeltaVariable<float> m_maxHate;
 	Archive::AutoDeltaVariable<time_t> m_lastUpdateTime;
 	Archive::AutoDeltaVariable<time_t> m_autoExpireTargetDuration;
-	stdset<CachedNetworkId>::fwd m_recentHateList; // This is used for assist logic
+	std::set<CachedNetworkId> m_recentHateList; // This is used for assist logic
 };
 
 //----------------------------------------------------------------------

engine/server/library/serverGame/src/shared/ai/Squad.h

@@ -23,8 +23,8 @@ public:
 
 	friend class SpaceSquadManager;
 
-	typedef stdmap<CachedNetworkId, PersistentCrcString const *>::fwd UnitMap;
-	typedef stdvector<CachedNetworkId>::fwd UnitList;
+	typedef std::map<CachedNetworkId, PersistentCrcString const *> UnitMap;
+	typedef std::vector<CachedNetworkId> UnitList;
 
 	static void install();
 

engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h

@@ -36,8 +36,8 @@ public:
 		AiShipAttackTargetEntry();
 	};
 
-	typedef stdmap<CachedNetworkId, AiShipAttackTargetEntry>::fwd TargetList;
-	typedef stdvector<std::pair<CachedNetworkId, AiShipAttackTargetEntry> >::fwd SortedTargetList;
+	typedef std::map<CachedNetworkId, AiShipAttackTargetEntry> TargetList;
+	typedef std::vector<std::pair<CachedNetworkId, AiShipAttackTargetEntry> > SortedTargetList;
 
 public:
 

engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h

@@ -48,7 +48,7 @@ public:
 	
 	// Path management.
 	class Path;
-	typedef stdvector<Path*>::fwd PathList;
+	typedef std::vector<Path*> PathList;
 	void addPath(Path * path);
 	Path * getCurrentPath();
 	bool selectNextPath();

engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h

@@ -56,7 +56,7 @@ private:
 	Path();
 	virtual ~Path();
 
-	typedef stddeque<Node>::fwd NodeList;
+	typedef std::deque<Node> NodeList;
 	NodeList * const m_nodeList;
 
 private: // Disabled.

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<Transform>::fwd HardPointList;
+	typedef std::list<Transform> HardPointList;
 
 	ShipController & m_shipController;
 	CachedNetworkId m_dockTarget;

engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h

@@ -54,7 +54,7 @@ class ShipTurretTargetingSystem
 	bool buildTargetList();
 
   protected:
-	typedef stdmap<NetworkId, int>::fwd TurretsPerTargetType;
+	typedef std::map<NetworkId, int> TurretsPerTargetType;
 
   private:
 	ShipController & m_shipController;

engine/server/library/serverGame/src/shared/city/CityInterface.h

@@ -25,22 +25,22 @@ class Vector;
 class CityInterface // static
 {
 public:
-	static stdvector<int>::fwd const &getCitizenOfCityId(NetworkId const &citizenId);
+	static std::vector<int> const &getCitizenOfCityId(NetworkId const &citizenId);
 	static int getMilitiaOfCityId(NetworkId const &citizenId);
-	static void getAllCityIds(stdvector<int>::fwd &results);
+	static void getAllCityIds(std::vector<int> &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<NetworkId>::fwd &results);
+	static void getCitizenIds(int cityId, std::vector<NetworkId> &results);
 	static int getCitizenCount(int cityId);
-	static void getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results);
+	static void getCityStructureIds(int cityId, std::vector<NetworkId> &results);
 	static CityInfo const &getCityInfo(int cityId);
-	static stdmap<int, CityInfo>::fwd const &getAllCityInfo();
+	static std::map<int, CityInfo> const &getAllCityInfo();
 	static CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId);
-	static stdmap<std::pair<int, NetworkId>, CitizenInfo>::fwd const &getAllCitizensInfo();
+	static std::map<std::pair<int, NetworkId>, CitizenInfo> const &getAllCitizensInfo();
 	static CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId);
-	static stdmap<std::pair<int, NetworkId>, CityStructureInfo>::fwd const & getAllCityStructuresInfo();
+	static std::map<std::pair<int, NetworkId>, CityStructureInfo> const & getAllCityStructuresInfo();
 	static std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderCities();
 	static std::map<std::string, std::pair<int, int> > 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<std::string>::fwd &ranks);
+	static void getCitizenRank(int cityId, NetworkId const &citizenId, std::vector<std::string> &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);

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<uint32>::fwd Uint32Vector;
+	typedef std::vector<uint32> Uint32Vector;
 	static Uint32Vector s_tradeAllowedCommands;
 
 	if (!s_tradeAllowedCommandsInit)

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<int, stdset<int>::fwd >::fwd & itemTypeMap);
+	static void updateItemTypeMap(int itemTypeMapVersionNumber, const std::map<int, std::set<int> > & itemTypeMap);
 	static void updateItemTypeMap(int itemTypeMapVersionNumber, int itemType, int itemTemplateId);
-	static const stdmap<int, stdmap<int, std::pair<int, StringId> >::fwd >::fwd & getItemTypeMap();
+	static const std::map<int, std::map<int, std::pair<int, StringId> > > & getItemTypeMap();
 	static int  getItemTypeMapVersionNumber();
 
-	static void updateResourceTypeMap(int resourceTypeMapVersionNumber, const stdmap<int, stdset<std::string>::fwd >::fwd & resourceTypeMap);
+	static void updateResourceTypeMap(int resourceTypeMapVersionNumber, const std::map<int, std::set<std::string> > & resourceTypeMap);
 	static void updateResourceTypeMap(int resourceTypeMapVersionNumber, int resourceClassCrc, const std::string & resourceName);
-	static const stdmap<int, stdset<std::string>::fwd >::fwd & getResourceTypeMap();
+	static const std::map<int, std::set<std::string> > & getResourceTypeMap();
 	static int  getResourceTypeMapVersionNumber();
 
 	static void sendToCommoditiesServer(const GameNetworkMessage & message);

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)

engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp

@@ -842,7 +842,7 @@ bool AICreatureController::wander( float minDistance, float maxDistance, float m
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::wander() owner(%s) minDistance(%.2f) maxDistance(%.2f) minAngle(%.2f) maxAngle(%.2f) minDelay(%.2f) maxDelay(%.2f) Trying to wander while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, minAngle, maxAngle, minDelay, maxDelay));
+		DEBUG_WARNING(true, ("AICreatureController::wander() owner(%s) minDistance(%.2f) maxDistance(%.2f) minAngle(%.2f) maxAngle(%.2f) minDelay(%.2f) maxDelay(%.2f) Trying to wander while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, minAngle, maxAngle, minDelay, maxDelay));
 		return false;
 	}
 
@@ -876,7 +876,7 @@ void AICreatureController::loiter(CellProperty const * homeCell, Vector const &
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), ((homeCell != nullptr) ? homeCell->getCellName() : "nullptr"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay));
+		DEBUG_WARNING(true, ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), ((homeCell != nullptr) ? homeCell->getCellName() : "nullptr"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay));
 		return;
 	}
 
@@ -892,7 +892,7 @@ void AICreatureController::loiter(NetworkId const & homeId, float const minDista
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::loiter() owner(%s) home(%s) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), homeId.getValueString().c_str(), minDistance, maxDistance, minDelay, maxDelay));
+		DEBUG_WARNING(true, ("AICreatureController::loiter() owner(%s) home(%s) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), homeId.getValueString().c_str(), minDistance, maxDistance, minDelay, maxDelay));
 		return;
 	}
 
@@ -910,7 +910,7 @@ void AICreatureController::moveTo(CellProperty const * cell, Vector const & targ
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), ((cell != nullptr) ? cell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z, radius));
+		DEBUG_WARNING(true, ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), ((cell != nullptr) ? cell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z, radius));
 		return;
 	}
 
@@ -949,7 +949,7 @@ void AICreatureController::moveTo(Unicode::String const & targetName)
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::moveTo() owner(%s) target(%s) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), Unicode::wideToNarrow(targetName).c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::moveTo() owner(%s) target(%s) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), Unicode::wideToNarrow(targetName).c_str()));
 		return;
 	}
 
@@ -984,7 +984,7 @@ void AICreatureController::patrol( std::vector<Location> const & locations, bool
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::patrol() owner(%s) Trying to patrol while retreating, failing request.", getDebugInformation().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::patrol() owner(%s) Trying to patrol while retreating, failing request.", getDebugInformation().c_str()));
 		return;
 	}
 
@@ -1018,7 +1018,7 @@ void AICreatureController::patrol( std::vector<Unicode::String> const & location
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::patrol() owner(%s) Trying to patrol while retreating, failing request.", getDebugInformation().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::patrol() owner(%s) Trying to patrol while retreating, failing request.", getDebugInformation().c_str()));
 		return;
 	}
 
@@ -1052,7 +1052,7 @@ void AICreatureController::stop()
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::stop() owner(%s) Trying to stop while retreating, failing request.", getDebugInformation().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::stop() owner(%s) Trying to stop while retreating, failing request.", getDebugInformation().c_str()));
 		return;
 	}
 
@@ -1071,7 +1071,7 @@ bool AICreatureController::faceTo(CellProperty const * targetCell, Vector const
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) Trying to faceTo while retreating, failing faceTo request.", getDebugInformation().c_str(), ((targetCell != nullptr) ? targetCell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z));
+		DEBUG_WARNING(true, ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) Trying to faceTo while retreating, failing faceTo request.", getDebugInformation().c_str(), ((targetCell != nullptr) ? targetCell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z));
 		return false;
 	}
 
@@ -1110,7 +1110,7 @@ bool AICreatureController::faceTo( NetworkId const & targetId )
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::faceTo() owner(%s) Trying to faceTo the target(%s) while retreating, failing request.", getDebugInformation().c_str(), targetId.getValueString().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::faceTo() owner(%s) Trying to faceTo the target(%s) while retreating, failing request.", getDebugInformation().c_str(), targetId.getValueString().c_str()));
 		return false;
 	}
 
@@ -1155,7 +1155,7 @@ bool AICreatureController::follow( NetworkId const & targetId, float minDistance
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::follow() owner(%s) distance[%.2f...%.2f] Trying to follow the target(%s) while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, targetId.getValueString().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::follow() owner(%s) distance[%.2f...%.2f] Trying to follow the target(%s) while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, targetId.getValueString().c_str()));
 		return false;
 	}
 
@@ -1203,7 +1203,7 @@ bool AICreatureController::follow( NetworkId const & targetId, Vector const & of
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::follow() owner(%s) offset(%.0f, %.0f, %.0f) Trying to follow the target(%s) while retreating, failing request.", getDebugInformation().c_str(), offset.x, offset.y, offset.z, targetId.getValueString().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::follow() owner(%s) offset(%.0f, %.0f, %.0f) Trying to follow the target(%s) while retreating, failing request.", getDebugInformation().c_str(), offset.x, offset.y, offset.z, targetId.getValueString().c_str()));
 		return false;
 	}
 
@@ -1254,7 +1254,7 @@ bool AICreatureController::swarm( NetworkId const & targetId )
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::swarm() owner(%s) Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), targetId.getValueString().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::swarm() owner(%s) Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), targetId.getValueString().c_str()));
 		return false;
 	}
 
@@ -1290,7 +1290,7 @@ bool AICreatureController::swarm( NetworkId const & targetId, float offset )
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::swarm() owner(%s) offset(%.2f) Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), offset, targetId.getValueString().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::swarm() owner(%s) offset(%.2f) Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), offset, targetId.getValueString().c_str()));
 		return false;
 	}
 
@@ -1314,7 +1314,7 @@ bool AICreatureController::flee( NetworkId const & targetId, float minDistance,
 {
 	if (isRetreating())
 	{
-		WARNING(true, ("AICreatureController::flee() owner(%s) distance[%.2f...%.2f] Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, targetId.getValueString().c_str(), targetId.getValueString().c_str()));
+		DEBUG_WARNING(true, ("AICreatureController::flee() owner(%s) distance[%.2f...%.2f] Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, targetId.getValueString().c_str(), targetId.getValueString().c_str()));
 		return false;
 	}
 
@@ -2411,7 +2411,7 @@ NetworkId AICreatureController::createWeapon(char const * const functionName, Cr
 		{
 			if (required)
 			{
-				WARNING(required, ("debug_ai: AICreatureController::%s() A required weapon is specified as ""none"" for (%s), defaulting to ""unarmed""", functionName, getDebugInformation().c_str()));
+				DEBUG_WARNING(required, ("debug_ai: AICreatureController::%s() A required weapon is specified as ""none"" for (%s), defaulting to ""unarmed""", functionName, getDebugInformation().c_str()));
 				result = getUnarmedWeapon();
 			}
 			else

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<Location>::fwd const & locations, bool random, bool flip, bool repeat, int startPoint);
-	void                 patrol                  ( stdvector<Unicode::String>::fwd const & locations, bool random, bool flip, bool repeat, int startPoint);
+	void                 patrol                  ( std::vector<Location> const & locations, bool random, bool flip, bool repeat, int startPoint);
+	void                 patrol                  ( std::vector<Unicode::String> 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);

engine/server/library/serverGame/src/shared/controller/AiShipController.h

@@ -45,9 +45,9 @@ public:
 		AO_count
 	};
 
-	typedef stdvector<Transform>::fwd TransformList;
-	typedef stdvector<CachedNetworkId>::fwd CachedNetworkIdList;
-	typedef stdvector<NetworkId>::fwd NetworkIdList;
+	typedef std::vector<Transform> TransformList;
+	typedef std::vector<CachedNetworkId> CachedNetworkIdList;
+	typedef std::vector<NetworkId> NetworkIdList;
 
 	static void install();
 
@@ -168,7 +168,7 @@ protected:
 
 private:
 
-	typedef stdset<CachedNetworkId>::fwd CachedNetworkIdSet;
+	typedef std::set<CachedNetworkId> CachedNetworkIdSet;
 
 	enum CountermeasureState
 	{

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<const MessageQueueNetworkId *>(data));
 
-		typedef stdvector<InstallationResourceData>::fwd DataVector;
+		typedef std::vector<InstallationResourceData> DataVector;
 		DataVector dv;
 
 		HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(ServerWorld::findObjectByNetworkId(msg->getNetworkId()));

engine/server/library/serverGame/src/shared/controller/PlayerShipController.h

@@ -80,7 +80,7 @@ private:
 
 private:
 
-	typedef stdmap<NetworkId, int>::fwd GunnerWeaponIndexList;
+	typedef std::map<NetworkId, int> GunnerWeaponIndexList;
 
 	uint32 m_clientToServerLastSyncStamp;
 	std::set<int> m_teleportIds;

engine/server/library/serverGame/src/shared/controller/ShipController.h

@@ -30,8 +30,8 @@ class ShipController : public TangibleController
 {
 public:
 
-	typedef stdset<CachedNetworkId>::fwd CachedNetworkIdList;
-	typedef stdmultiset<CachedNetworkId>::fwd DockedByList;
+	typedef std::set<CachedNetworkId> CachedNetworkIdList;
+	typedef std::multiset<CachedNetworkId> DockedByList;
 
 	explicit ShipController(ShipObject * newOwner);
 	virtual ~ShipController();

engine/server/library/serverGame/src/shared/core/AttribModNameManager.h

@@ -54,7 +54,7 @@ private:
 	};
 
 	typedef std::set<std::string> Names;
-	typedef stdmap<uint32, Names::const_iterator>::fwd CrcNameMap;
+	typedef std::map<uint32, Names::const_iterator> CrcNameMap;
 
 	Names      * m_names;
 	CrcNameMap * m_crcMap;

engine/server/library/serverGame/src/shared/core/BiographyManager.cpp

@@ -22,7 +22,7 @@
 // ======================================================================
 
 bool BiographyManager::m_installed = false;
-stdmap<NetworkId, stdvector<CachedNetworkId>::fwd >::fwd *BiographyManager::m_retrievalQueue;
+std::map<NetworkId, std::vector<CachedNetworkId> > *BiographyManager::m_retrievalQueue;
 
 
 BiographyManager::BiographyManager()

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<NetworkId, stdvector<CachedNetworkId>::fwd >::fwd *m_retrievalQueue;
+	static std::map<NetworkId, std::vector<CachedNetworkId> > *m_retrievalQueue;
 };
 
 // ======================================================================

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<uint32, int> AccountFeatureIdList;
 
-	Client                  (ConnectionServerConnection & connection, const NetworkId & characterObjectId, const std::string& accountName, const std::string& ipAddr, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, stdset<NetworkId>::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<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > 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<NetworkId> 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<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > 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<NetworkId>                           m_previousObservedObjects;
-	stdvector<Watcher<ServerSynchronizedUi> >::fwd m_syncUIs;
+	std::vector<Watcher<ServerSynchronizedUi> > m_syncUIs;
 	std::vector<std::pair<NetworkId, std::string> > m_consumedRewardEvents;
 	std::vector<std::pair<NetworkId, std::string> > m_claimedRewardItems;
 	bool                                          m_usingAdminLogin;

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<ServerObject *>::fwd &combatViewers);
+	static void getInterestedViewers(TangibleObject const *defender, std::vector<ServerObject *> &combatViewers);
 };
 
 // ======================================================================

engine/server/library/serverGame/src/shared/core/ConfigServerGame.h

@@ -580,7 +580,7 @@ class ConfigServerGame
 
 	static Data *data;
 	static Vector startingPosition;
-	static stdmap<std::string, std::string>::fwd m_components;
+	static std::map<std::string, std::string> m_components;
 	
 
   public:

engine/server/library/serverGame/src/shared/core/ConsentManager.h

@@ -37,7 +37,7 @@ private:
 	ConsentManager &operator =(ConsentManager const &);
 
 private:
-	stdmap<NetworkId, stdlist<std::pair<int, CallbackFunction> >::fwd >::fwd m_consentMap;
+	std::map<NetworkId, std::list<std::pair<int, CallbackFunction> > > m_consentMap;
 	int m_nextId;
 };
 

engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp

@@ -707,7 +707,7 @@ bool ContainerInterface::transferItemToSlottedContainer(ServerObject &destinatio
 
 	if (arrangementIndex < 0)
 	{
-		WARNING_STRICT_FATAL(true, ("Invaid arrangement index in transferItemToSlottedContainer"));
+		DEBUG_WARNING(true, ("Invaid arrangement index in transferItemToSlottedContainer"));
 		error = Container::CEC_InvalidArrangement;
 		return false;
 	}

engine/server/library/serverGame/src/shared/core/GameServer.h

@@ -62,8 +62,8 @@ class GameServer :
 public MessageDispatch::Receiver
 {
 public:
-	typedef stdunordered_map<NetworkId, Client *, NetworkId::Hash>::fwd ClientMap;
-	typedef stdvector<ConnectionServerConnection *>::fwd           ConnectionServerVector;
+	typedef std::unordered_map<NetworkId, Client *, NetworkId::Hash> ClientMap;
+	typedef std::vector<ConnectionServerConnection *>           ConnectionServerVector;
 
 	virtual ~GameServer ();
 
@@ -117,10 +117,10 @@ public:
 	
 	void                         loadTerrain ();
 
-	stdvector<uint32>::fwd const &getAllGameServerPids() const;
+	std::vector<uint32> const &getAllGameServerPids() const;
 	bool                         hasConnectionsToOtherGameServers() const;
 
-	void                         getObjectsWithClients(stdvector<ServerObject *>::fwd &objects) const;
+	void                         getObjectsWithClients(std::vector<ServerObject *> &objects) const;
 
 	static uint64                getTotalObjectCreatesReceived();
 	static uint64                getTotalObjectCreatesSent();
@@ -185,8 +185,8 @@ private:
 	//-----------------------------------------------------------------------
 	//	maps
 	
-	typedef stdmap<NetworkId, stdvector<NetworkId>::fwd >::fwd     PendingContainedObjectsMap;
-	typedef stdmap<uint32, const CentralCreateCharacter *>::fwd    CharactersPendingCreationMap;
+	typedef std::map<NetworkId, std::vector<NetworkId> >     PendingContainedObjectsMap;
+	typedef std::map<uint32, const CentralCreateCharacter *>    CharactersPendingCreationMap;
 
 	bool                            m_done;
 	uint32                          m_processId;

engine/server/library/serverGame/src/shared/core/InstantDeleteList.h

@@ -26,7 +26,7 @@ class InstantDeleteList
 	static bool isOnList(const ObjectTemplate &theTemplate);
 
   private:
-	typedef stdset<uint32>::fwd ListType; 
+	typedef std::set<uint32> ListType; 
 	static ListType *ms_theList;
 };
 

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<int8>::fwd &packedData, int delay)
+void MessageToQueue::sendRecurringMessageToJava(const NetworkId &objectId, const std::string &method, const std::vector<int8> &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)

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<int8>::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<int8> &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<int8>::fwd &packedData, int delay);
+	static void sendRecurringMessageToJava         (const NetworkId &objectId, const std::string &method, const std::vector<int8> &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);

engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp

@@ -27,7 +27,7 @@
 
 namespace MoveSimManagerNamespace
 {
-	typedef stdvector<NetworkId>::fwd NetworkIdVector;
+	typedef std::vector<NetworkId> NetworkIdVector;
 	NetworkIdVector s_moveSimCreatures;
 
 	const char * const templateName_npc = "object/mobile/kaadu_hue.iff";

engine/server/library/serverGame/src/shared/core/NameManager.cpp

@@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id)
 
 // ----------------------------------------------------------------------
 
-void NameManager::addPlayers(const stdvector<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &names, const stdvector<std::string>::fwd &fullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &lastLoginTimes)
+void NameManager::addPlayers(const std::vector<NetworkId> &ids, const std::vector<int> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int> &createTimes, const std::vector<int> &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"));

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<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &names, const stdvector<std::string>::fwd &fullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &lastLoginTimes);
+	void                  addPlayers           (const std::vector<NetworkId> &ids, const std::vector<int> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int> &createTimes, const std::vector<int> &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<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
-	void                  getPlayerWithLastLoginTimeBefore (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
-	void                  getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
-	void                  getPlayerWithLastLoginTimeAfterDistribution (stdmap<int, std::pair<std::string, int> >::fwd &result) const;
-	void                  getPlayerWithCreateTimeAfter (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
-	void                  getPlayerWithCreateTimeBefore (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
-	void                  getPlayerWithCreateTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
-	void                  getPlayerWithCreateTimeAfterDistribution (stdmap<int, std::pair<std::string, int> >::fwd &result) const;
+	void                  getPlayerWithLastLoginTimeAfter (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
+	void                  getPlayerWithLastLoginTimeBefore (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
+	void                  getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
+	void                  getPlayerWithLastLoginTimeAfterDistribution (std::map<int, std::pair<std::string, int> > &result) const;
+	void                  getPlayerWithCreateTimeAfter (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
+	void                  getPlayerWithCreateTimeBefore (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
+	void                  getPlayerWithCreateTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
+	void                  getPlayerWithCreateTimeAfterDistribution (std::map<int, std::pair<std::string, int> > &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<NameTableIdentifier, NameGenerator*>::fwd NameGeneratorMapType;
-	typedef stdmap<NetworkId, CharacterData>::fwd IdToCharacterDataMapType;
-	typedef stdmap<std::string, NetworkId>::fwd NameToIdMapType;
+	typedef std::map<NameTableIdentifier, NameGenerator*> NameGeneratorMapType;
+	typedef std::map<NetworkId, CharacterData> IdToCharacterDataMapType;
+	typedef std::map<std::string, NetworkId> NameToIdMapType;
 
   private:
 	mutable NameGeneratorMapType * m_nameGenerators;

engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h

@@ -55,7 +55,7 @@ class NonCriticalTaskQueue : public Singleton2<NonCriticalTaskQueue>
 	~NonCriticalTaskQueue  ();
 
   private:
-	typedef stdlist<TaskRequest*>::fwd TaskListType;
+	typedef std::list<TaskRequest*> TaskListType;
 	
 	TaskListType *m_tasks;
 };

engine/server/library/serverGame/src/shared/core/NpcConversation.h

@@ -66,7 +66,7 @@ private:
 	CachedNetworkId                  m_player;
 	CachedNetworkId                  m_npc;
 
-	typedef stdvector<Response>::fwd ResponseVector;
+	typedef std::vector<Response> ResponseVector;
 	ResponseVector *                 m_responses;
 	uint32                           m_appearanceOverrideSharedTemplateCrc;
 

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<NetworkId>::fwd const &oldObserveList);
-	static void onClientControlComplete(Client &client, stdset<NetworkId>::fwd const &oldObserveList);
-	static void onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, stdset<NetworkId>::fwd const *oldObserveList = 0);
+	static void onObjectControlled(Client &client, ServerObject &obj, std::set<NetworkId> const &oldObserveList);
+	static void onClientControlComplete(Client &client, std::set<NetworkId> const &oldObserveList);
+	static void onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set<NetworkId> 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<NetworkId>::fwd const *oldObserveList = 0);
+	static void onClientEnteredPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set<NetworkId> 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<Client *>::fwd const & oldInventoryObservers);
+	static void onMakeVendorInventory(ServerObject &vendorInventory, std::set<Client *> const & oldInventoryObservers);
 	static void onClientAboutToOpenPublicContainer(Client & client, ServerObject & container);
 };
 

engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h

@@ -21,11 +21,11 @@ class PlanetMapManagerServer
 {
 public:
 
-	typedef stdvector<MapLocation>::fwd MapLocationVector;
-	typedef stdvector<int>::fwd         IntVector;
+	typedef std::vector<MapLocation> MapLocationVector;
+	typedef std::vector<int>         IntVector;
 
 	static void                handleClientRequest         (const Client & client, const GetMapLocationsMessage & msg);
-	static void                handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const stdset<std::pair<std::string, NetworkId> >::fwd & msg);
+	static void                handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const std::set<std::pair<std::string, NetworkId> > & msg);
 
 	static bool                addMapLocation              (const MapLocation & loc, int mapLocationType, bool enforceLocationCountLimits);
 	static bool                removeMapLocation           (const NetworkId & id);

engine/server/library/serverGame/src/shared/core/ProxyList.h

@@ -1,7 +1,7 @@
 #ifndef _ProxyList_H_
 #define _ProxyList_H_
 
-typedef stdset<uint32>::fwd ProxyList;
+typedef std::set<uint32> ProxyList;
 
 #endif // _ProxyList_H_
 

engine/server/library/serverGame/src/shared/core/PurgeManager.h

@@ -23,7 +23,7 @@
 class PurgeManager
 {
   public:
-	  static void handleStructuresAndVendorsForPurge(StationId stationId, stdvector<std::pair<NetworkId, NetworkId> >::fwd const & structures, stdvector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > >::fwd const & vendors, bool warnOnly);
+	  static void handleStructuresAndVendorsForPurge(StationId stationId, std::vector<std::pair<NetworkId, NetworkId> > const & structures, std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > const & vendors, bool warnOnly);
 };
 
 // ======================================================================

engine/server/library/serverGame/src/shared/core/RegexList.h

@@ -39,7 +39,7 @@ public:
 private:
 
 	class Entry;
-	typedef stdvector<Entry*>::fwd  EntryVector;
+	typedef std::vector<Entry*>  EntryVector;
 		
 private:
 

engine/server/library/serverGame/src/shared/core/ServerUIManager.h

@@ -42,8 +42,8 @@ private:
 	static int  getNewPageId();
 
 private:
-	static stdmap<int, ServerUIPage*>::fwd  m_pages;
-	static stdmultimap<NetworkId, int>::fwd  m_primaryControlledObjectMap;
+	static std::map<int, ServerUIPage*>  m_pages;
+	static std::multimap<NetworkId, int>  m_primaryControlledObjectMap;
 	static int m_pageCounter;
 };
 

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<int, ResourceClassObject*>::fwd &resourceClasses)
+void ServerUniverse::resourceClassTreeLoaded(std::map<int, ResourceClassObject*> &resourceClasses)
 {
 	ServerResourceClassObject::loadDistributionFromIff(resourceClasses);
 }
@@ -660,7 +660,7 @@ ResourceTypeObject const * ServerUniverse::pickRandomNonDepletedResource(const s
 
 // ----------------------------------------------------------------------
 
-void ServerUniverse::createGroup(GroupMemberParam const & leader, stdvector<GroupMemberParam>::fwd const & members)
+void ServerUniverse::createGroup(GroupMemberParam const & leader, std::vector<GroupMemberParam> const & members)
 {
 	if (m_authoritative)
 		GroupObject::createGroup(leader, members);

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<int, ResourceClassObject*>::fwd &resourceClasses);
+	virtual void         resourceClassTreeLoaded        (std::map<int, ResourceClassObject*> &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<GroupMemberParam>::fwd const & members);
+	void                 createGroup                    (GroupMemberParam const & leader, std::vector<GroupMemberParam> 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<NetworkId, LfgCharacterData>::fwd const & getConnectedCharacterLfgData();
+	static std::map<NetworkId, LfgCharacterData> 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<NetworkId, Unicode::String>::fwd const & getConnectedCharacterBiographyData();
+	static std::map<NetworkId, Unicode::String> 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<CachedNetworkId*>::fwd             UniverseObjectList;
+	typedef std::vector<CachedNetworkId*>             UniverseObjectList;
 	UniverseObjectList * m_universeObjectList;
 	UniverseObjectList * m_pendingUniverseObjects;
 	bool m_loaded;
@@ -148,7 +148,7 @@ private:
 	//
 	// Planet Objects
 	//
-	typedef stdmap<const std::string, PlanetObject*>::fwd PlanetNameMap;
+	typedef std::map<const std::string, PlanetObject*> PlanetNameMap;
 	
 	PlanetObject  *m_thisPlanet;
 	PlanetObject  *m_tatooinePlanet;
@@ -157,9 +157,9 @@ private:
 	//
 	// Resource Type Objects
 	//
-	typedef stdmap<std::string, ResourceTypeObject*>::fwd       ResourceTypeNameMap;
-	typedef stdmap<NetworkId, ResourceTypeObject*>::fwd         ResourceTypeIdMap;
-	typedef stdvector<ResourceTypeObject*>::fwd                 ResourcesToSendType;
+	typedef std::map<std::string, ResourceTypeObject*>       ResourceTypeNameMap;
+	typedef std::map<NetworkId, ResourceTypeObject*>         ResourceTypeIdMap;
+	typedef std::vector<ResourceTypeObject*>                 ResourcesToSendType;
 	
 	ResourceTypeNameMap *m_resourceTypeNameMap;
 	ResourceTypeIdMap *m_resourceTypeIdMap;
@@ -173,8 +173,8 @@ private:
 	//	 bool m_loaded;
 
 	// Theater data
-	typedef stdmap<const std::string, const NetworkId>::fwd TheaterNameIdMap;
-	typedef stdmap<const NetworkId, const std::string>::fwd TheaterIdNameMap;
+	typedef std::map<const std::string, const NetworkId> TheaterNameIdMap;
+	typedef std::map<const NetworkId, const std::string> TheaterIdNameMap;
 
 	TheaterNameIdMap * m_theaterNameIdMap;
 	TheaterIdNameMap * m_theaterIdNameMap;

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<ServerObject *>::fwd & results);
-	static void                 findStaticCollidableObjectsInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesInRange           (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
-	static void                 findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesOfNicheInRange    (const Vector & location, const float distance, int niche, int mask, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesOfSpeciesInRange  (const Vector & location, const float distance, int species, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesOfRaceInRange     (const Vector & location, const float distance, int species, int race, stdvector<ServerObject *>::fwd & results);
-	static void                 findNonCreaturesInRange        (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
-	static void                 findNPCsInRange                (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
-	static void                 findPlayerCreaturesInRange     (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+	static void                 findObjectsInRange             (const Vector & location, const float distance, std::vector<ServerObject *> & results);
+	static void                 findStaticCollidableObjectsInRange (const Vector & location, const float distance, std::vector<ServerObject *> & results);
+	static void                 findCreaturesInRange           (const Vector & location, const float distance, std::vector<ServerObject *> & results);
+	static void                 findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results);
+	static void                 findCreaturesOfNicheInRange    (const Vector & location, const float distance, int niche, int mask, std::vector<ServerObject *> & results);
+	static void                 findCreaturesOfSpeciesInRange  (const Vector & location, const float distance, int species, std::vector<ServerObject *> & results);
+	static void                 findCreaturesOfRaceInRange     (const Vector & location, const float distance, int species, int race, std::vector<ServerObject *> & results);
+	static void                 findNonCreaturesInRange        (const Vector & location, const float distance, std::vector<ServerObject *> & results);
+	static void                 findNPCsInRange                (const Vector & location, const float distance, std::vector<ServerObject *> & results);
+	static void                 findPlayerCreaturesInRange     (const Vector & location, const float distance, std::vector<ServerObject *> & results);
 
-	static void                 findObjectsInCone              (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
-	static void                 findObjectsInCone              (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesInCone            (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesInCone            (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
-	static void                 findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesOfNicheInCone     (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int niche, int mask, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesOfSpeciesInCone   (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, stdvector<ServerObject *>::fwd & results);
-	static void                 findCreaturesOfRaceInCone      (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, int race, stdvector<ServerObject *>::fwd & results);
-	static void                 findNonCreaturesInCone         (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
-	static void                 findNPCsInCone                 (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
-	static void                 findPlayerCreaturesInCone      (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findObjectsInCone              (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
+	static void                 findObjectsInCone              (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, std::vector<ServerObject *> & results);
+	static void                 findCreaturesInCone            (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
+	static void                 findCreaturesInCone            (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, std::vector<ServerObject *> & results);
+	static void                 findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
+	static void                 findCreaturesOfNicheInCone     (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int niche, int mask, std::vector<ServerObject *> & results);
+	static void                 findCreaturesOfSpeciesInCone   (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, std::vector<ServerObject *> & results);
+	static void                 findCreaturesOfRaceInCone      (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, int race, std::vector<ServerObject *> & results);
+	static void                 findNonCreaturesInCone         (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
+	static void                 findNPCsInCone                 (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
+	static void                 findPlayerCreaturesInCone      (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & 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<std::pair<ServerObject *, Sphere> >::fwd & results);
-	static void                 dumpTriggerSphereTree           (stdvector<std::pair<TriggerVolume *, Sphere> >::fwd & results);
+	static void                 dumpObjectSphereTree            (std::vector<std::pair<ServerObject *, Sphere> > & results);
+	static void                 dumpTriggerSphereTree           (std::vector<std::pair<TriggerVolume *, Sphere> > & results);
 
 	static const WeatherData &  getWeather                      ();
 
@@ -145,9 +145,9 @@ public:
 	static void                 onPreloadComplete               ();
 	static bool                 isPreloadComplete               ();
 
-	static void                 getSpatialChatListeners(ServerObject &source, float distance, stdvector<ServerObject *>::fwd &results);
+	static void                 getSpatialChatListeners(ServerObject &source, float distance, std::vector<ServerObject *> &results);
 
-	static int                  getNumMoveLists(stdvector<int>::fwd & moveListSize);
+	static int                  getNumMoveLists(std::vector<int> & 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<ServerObject*>::fwd &candidates);
+	static ServerObject *findClosestObjectInList(const Vector &location, const std::vector<ServerObject*> &candidates);
 
 	static void    addTangibleObject(ServerObject * object);
 	static void    removeTangibleObject(ServerObject * object);

engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h

@@ -18,7 +18,7 @@ class NetworkId;
 class StaticLootItemManager
 {
 public:
-	typedef stdvector<std::pair<std::string, Unicode::String> >::fwd AttributeVector;
+	typedef std::vector<std::pair<std::string, Unicode::String> > AttributeVector;
 
 	static void sendDataToClient(NetworkId const & playerId, std::string const & staticItemName);
 	static void getAttributes(NetworkId const & playerId, std::string const & staticItemName, AttributeVector & data);

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<std::string, int>::fwd const & transactionsFromLoginServer);
+	static void verifyFeatureIdTransactions(CreatureObject & playerCreature, std::map<std::string, int> const & transactionsFromLoginServer);
 	static void migrateVeteranRewardsClaimInformation(CreatureObject & playerCreature);
-	static void getConsumedEvents(ServerObject const & playerCreature, stdvector<std::string>::fwd & consumedEvents);
-	static void getClaimedItems(ServerObject const & playerCreature, stdvector<std::string>::fwd & claimedItems);
+	static void getConsumedEvents(ServerObject const & playerCreature, std::vector<std::string> & consumedEvents);
+	static void getClaimedItems(ServerObject const & playerCreature, std::vector<std::string> & 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);

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<int>::fwd &results);
+	static void getAllGuildIds(std::vector<int> &results);
 	static int findGuild(std::string const &name);
 	static bool guildExists(int guildId);
 	static std::pair<int, time_t> const *hasDeclaredWarAgainst(int actorGuildId, int targetGuildId);
@@ -96,18 +96,18 @@ public:
 	static std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderGuilds();
 	static std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderGuildsCount();
 	static int getGcwRegionDefenderGuildsVersion();
-	static void getGuildMemberIds(int guildId, stdvector<NetworkId>::fwd &results);
-	static void getGuildMemberIdsWithPermissions(int guildId, int permissions, stdvector<NetworkId>::fwd &results);
+	static void getGuildMemberIds(int guildId, std::vector<NetworkId> &results);
+	static void getGuildMemberIdsWithPermissions(int guildId, int permissions, std::vector<NetworkId> &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<int>::fwd const &getGuildEnemies(int guildId);
-	static stdmap<int, std::pair<int, time_t> >::fwd const &getGuildEnemiesKillInfo(int guildId);
+	static std::vector<int> const &getGuildEnemies(int guildId);
+	static std::map<int, std::pair<int, time_t> > const &getGuildEnemiesKillInfo(int guildId);
 	static std::pair<int, time_t> const &getGuildEnemyKillInfo(int guildIdA, int guildIdB);
-	static stdvector<int>::fwd const &getGuildsAtWarWith(int guildId);
+	static std::vector<int> 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<std::string>::fwd &ranks);
+	static void getGuildMemberRank(int guildId, NetworkId const &memberId, std::vector<std::string> &ranks);
 	static void setGuildEnemy(int guildId, int enemyId);
 	static void removeGuildEnemy(int guildId, int enemyId);
 	static void updateGuildWarKillTracking(CreatureObject const &killer, CreatureObject const &victim);

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<NetworkId>::fwd & members) 
+void Chat::inviteGroupMembers(const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const std::vector<NetworkId> & members) 
 {
 	ChatInviteGroupMembersToRoom inviteMessage(invitor, groupLeader, room, members);
 	sendToChatServer(inviteMessage);

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<NetworkId>::fwd & members); 
+	static void inviteGroupMembers       (const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const std::vector<NetworkId> & 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<Archive::ByteStream>::fwd  m_deferredChatMessages;
+	std::vector<Archive::ByteStream>  m_deferredChatMessages;
 	std::string                          m_gameCode;
 };
 

engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h

@@ -20,7 +20,7 @@ class Client;
 class BaselineDistributionListPool
 {
 public:
-	static stdvector<Watcher<Client> >::fwd *get(ServerObject const &obj, bool allocIfNeeded);
+	static std::vector<Watcher<Client> > *get(ServerObject const &obj, bool allocIfNeeded);
 	static void free(ServerObject const &obj);
 };
 

engine/server/library/serverGame/src/shared/object/BuildingObject.cpp

@@ -648,7 +648,7 @@ bool BuildingObject::isVisibleOnClient (const Client & /*client*/) const
 
 // ----------------------------------------------------------------------
 
-void BuildingObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+void BuildingObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
 {
 	TangibleObject::getAttributes(data);
 }

engine/server/library/serverGame/src/shared/object/BuildingObject.h

@@ -44,7 +44,7 @@ public:
 
 	virtual Controller* createDefaultController(void);
 	void                addMembersToPackages   ();
-	virtual void        getAttributes          (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void        getAttributes          (std::vector<std::pair<std::string, Unicode::String> > &data) const;
 
 	int                 getMaintenanceCost() const;
 	void                setMaintenanceCost(int newConst);
@@ -89,7 +89,7 @@ public:
 		};
 	};
 
-	typedef stdunordered_set<const BuildingObject *, BuildingObjectPointerHash>::fwd AllBuildingsSet;
+	typedef std::unordered_set<const BuildingObject *, BuildingObjectPointerHash> AllBuildingsSet;
 	static const AllBuildingsSet & getAllBuildings();
 
 protected:

engine/server/library/serverGame/src/shared/object/CellObject.cpp

@@ -581,7 +581,7 @@ bool CellObject::isVisibleOnClient (const Client & /*client*/) const
 
 // ----------------------------------------------------------------------
 
-void CellObject::getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+void CellObject::getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const
 {
 	ServerObject::getAttributes(data);
 }

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<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void           getAttributes                  (std::vector<std::pair<std::string, Unicode::String> > &data) const;
 
 	virtual const NetworkId &     getOwnerId() const;
 	virtual bool                  isOwner(NetworkId const &id, Client const *client) const;

engine/server/library/serverGame/src/shared/object/CellPermissions.h

@@ -92,7 +92,7 @@ namespace CellPermissions
 		std::string        m_permissionString;
 	};
 
-	typedef stdset<PermissionObject>::fwd PermissionList;
+	typedef std::set<PermissionObject> PermissionList;
 
 	//----------------------------------------------------------------------
 
@@ -109,7 +109,7 @@ namespace CellPermissions
 
 		void init(BuildingObject *building);
 		void getCellPermissions(ServerObject &obj);
-		void handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, stdvector<CreatureObject*>::fwd &expel);
+		void handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, std::vector<CreatureObject*> &expel);
 
 	private:
 		ProfilerAutoBlock m_profilerBlock;

engine/server/library/serverGame/src/shared/object/CityObject.cpp

@@ -394,7 +394,7 @@ void CityObject::setupUniverse()
 
 // ----------------------------------------------------------------------
 
-void CityObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+void CityObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
 {
 	UniverseObject::getAttributes(data);
 }
@@ -1980,7 +1980,7 @@ CitizenInfo const *CityObject::getCitizenInfo(int cityId, NetworkId const &citiz
 
 // ----------------------------------------------------------------------
 
-void CityObject::getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results) const
+void CityObject::getCityStructureIds(int cityId, std::vector<NetworkId> &results) const
 {
 	results.clear();
 

engine/server/library/serverGame/src/shared/object/CityObject.h

@@ -32,7 +32,7 @@ public:
 
 	virtual Controller* createDefaultController();
 	virtual void setupUniverse();
-	virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void getAttributes(std::vector<std::pair<std::string, Unicode::String> > &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<std::string>::fwd &ranks);
+	void getCitizenRank(int cityId, NetworkId const &citizenId, std::vector<std::string> &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<int>::fwd &results) const;
-	stdmap<int, CityInfo>::fwd const &getAllCityInfo() const;
+	void getAllCityIds(std::vector<int> &results) const;
+	std::map<int, CityInfo> 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<NetworkId>::fwd &results) const;
-	stdmap<std::pair<int, NetworkId>, CitizenInfo>::fwd const &getAllCitizensInfo() const;
+	void getCitizenIds(int cityId, std::vector<NetworkId> &results) const;
+	std::map<std::pair<int, NetworkId>, CitizenInfo> const &getAllCitizensInfo() const;
 	CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId) const;
-	void getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results) const;
-	stdmap<std::pair<int, NetworkId>, CityStructureInfo>::fwd const & getAllCityStructuresInfo() const;
+	void getCityStructureIds(int cityId, std::vector<NetworkId> &results) const;
+	std::map<std::pair<int, NetworkId>, CityStructureInfo> const & getAllCityStructuresInfo() const;
 	CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId) const;
-	stdvector<int>::fwd const & getCitizenOfCityId(NetworkId const &citizenId) const;
+	std::vector<int> const & getCitizenOfCityId(NetworkId const &citizenId) const;
 
 	std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderCities() const;
 	std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderCitiesCount() const;

engine/server/library/serverGame/src/shared/object/CreatureObject.cpp

@@ -422,7 +422,7 @@ namespace CreatureObjectNamespace
 
 		const NetworkId & targetId = target.getNetworkId ();
 
-		typedef stdvector<NetworkId>::fwd NetworkIdVector;
+		typedef std::vector<NetworkId> 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<Unicode::String>::fwd StringVector;
+		typedef std::vector<Unicode::String> StringVector;
 		static StringVector sv;
 		sv.clear ();
 
@@ -8909,7 +8909,7 @@ void CreatureObject::updateMissionRequestQueue()
 
 // ----------------------------------------------------------------------
 
-void CreatureObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+void CreatureObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
 {
 	TangibleObject::getAttributes(data);
 }
@@ -13910,7 +13910,7 @@ bool CreatureObject::stillHasBuffState(uint32 buffNameCrc, int state) const
 
 // ----------------------------------------------------------------------
 
-void CreatureObject::getAllBuffs(stdvector<uint32>::fwd & buffCrcs) const
+void CreatureObject::getAllBuffs(std::vector<uint32> & buffCrcs) const
 {
 	buffCrcs.clear();
 	buffCrcs.reserve(m_buffs.size());

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<std::string, int>::fwd            ExperiencePointMap;
-	typedef stdset<const SkillObject *>::fwd         SkillList;
-	typedef stdvector<std::string>::fwd              StringVector;
+	typedef std::map<std::string, int>            ExperiencePointMap;
+	typedef std::set<const SkillObject *>         SkillList;
+	typedef std::vector<std::string>              StringVector;
 	typedef std::pair<std::pair<NetworkId /*player*/, std::string /*name*/>, 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<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void        getAttributes            (std::vector<std::pair<std::string, Unicode::String> > &data) const;
 	void                sendTimedModData         (uint32 id, float time, bool updateCache = true);
 	void                sendCancelTimedMod       (uint32 id);
 	
@@ -277,13 +277,13 @@ public:
 	virtual const std::set<TriggerVolume *> * getTriggerVolumeEntered      () const;
 
 	// crafting functions
-	const stdmap<std::pair<uint32, uint32>,int>::fwd &  getDraftSchematics () const;
+	const std::map<std::pair<uint32, uint32>,int> &  getDraftSchematics () const;
 	bool                                isIngredientInInventory(const Object & ingredient) const;
 	void                                disableSchematicFiltering(void);
 	void                                enableSchematicFiltering(void);
 	bool                                isSchematicFilteringEnabled(void);
-	void                                getManufactureSchematics(stdvector<const ManufactureSchematicObject *>::fwd & schematics);
-	void                                getManufactureSchematics(stdvector<const ManufactureSchematicObject *>::fwd & schematics, uint32 craftingTypes);
+	void                                getManufactureSchematics(std::vector<const ManufactureSchematicObject *> & schematics);
+	void                                getManufactureSchematics(std::vector<const ManufactureSchematicObject *> & 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<std::string, int> &  getExperiencePoints() const;
 	const SkillList &   getSkillList() const;
-	const stdmap<std::string, std::pair<int, int> >::fwd & getModMap() const;
+	const std::map<std::string, std::pair<int, int> > & 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<uint32, CreatureMod>::fwd & getAttributeModifiers () const;
+	const std::map<uint32, CreatureMod> & 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<NetworkId>::fwd &targets);
+	void                 getBehaviorTargets(Behaviors::Enumerator behavior, std::vector<NetworkId> &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<const CreatureObject *>::fwd & riders) const;
-	void                                   getMountingRiders(stdvector<CreatureObject *>::fwd & riders);
+	void                                   getMountingRiders(std::vector<const CreatureObject *> & riders) const;
+	void                                   getMountingRiders(std::vector<CreatureObject *> & riders);
 
 	// Called on rider.
 	bool                                   mountCreature(CreatureObject &mountObject);
@@ -507,7 +507,7 @@ public:
 	bool                                   pilotShip(ServerObject &pilotSlotObject);
 	bool                                   unpilotShip();
 
-	void                                   getAllShipsInDatapad(stdvector<NetworkId>::fwd & ships) const;
+	void                                   getAllShipsInDatapad(std::vector<NetworkId> & ships) const;
 
 	// ======
 
@@ -519,7 +519,7 @@ public:
 		};
 	};
 
-	typedef stdunordered_set<const CreatureObject *, CreatureObjectPointerHash>::fwd AllCreaturesSet;
+	typedef std::unordered_set<const CreatureObject *, CreatureObjectPointerHash> 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<uint32>::fwd  & buffCrcs) const;
+	void getAllBuffs(std::vector<uint32>  & 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<std::string, int>::fwd const & getCommandList() const;
+	std::map<std::string, int> 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<Attributes::Enumerator, Attributes::Value>::fwd & targets);
+	int      getCurrentTargetsTotal(const std::map<Attributes::Enumerator, Attributes::Value> & targets);
 	
 	int      changeAttribModCurrentValue(Attributes::Enumerator attrib, int delta, bool checkPoolOverflow);
 	void     recomputeAttribModTotals(bool checkPoolOverflow);
@@ -799,7 +799,7 @@ private:
 	};
 	friend struct StateChangeCallback;
 
-	typedef stdvector<MessageQueueMissionListResponseData>::fwd         MessageQueueMissionListResponseDataVector;
+	typedef std::vector<MessageQueueMissionListResponseData>         MessageQueueMissionListResponseDataVector;
 	MessageQueueMissionListResponseDataVector      m_missionResponseEntries;
 
 	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given

engine/server/library/serverGame/src/shared/object/DistributionListStack.h

@@ -22,7 +22,7 @@ class ConnectionServerConnection;
 class DistributionListStack
 {
 public:
-	static stdmap<ConnectionServerConnection *, stdvector<NetworkId>::fwd>::fwd &alloc();
+	static std::map<ConnectionServerConnection *, std::vector<NetworkId>> &alloc();
 	static void release();
 
 private:

engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp

@@ -557,7 +557,7 @@ void DraftSchematicObject::remove()
 
 // ----------------------------------------------------------------------
 
-void DraftSchematicObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+void DraftSchematicObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
 {
 	IntangibleObject::getAttributes(data);
 }

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<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void                                                   getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const;
 
 	const StringId                getExperimentalAttributeFromAttribute(int index) const;
 	const StringId                getExperimentalAttributeFromAttribute(const StringId & attribName) const;

engine/server/library/serverGame/src/shared/object/FactoryObject.h

@@ -36,7 +36,7 @@ public:
 
 	virtual Controller*    createDefaultController(void);
 	void                   addMembersToPackages   ();
-	virtual void           getAttributes          (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void           getAttributes          (std::vector<std::pair<std::string, Unicode::String> > &data) const;
 
 	bool                   startCraftingSession(ManufactureSchematicObject & schematic);	
 	bool                   endCraftingSession();