persister cleanup (still broke but logic is there for when it isn't); also replace all the SOE BS for forwarding stl port with native object classes because i thought that may be part of the problem...

engine/shared/library/sharedCollision/src/shared/core/BoxTree.h

@@ -24,9 +24,9 @@ class VectorArgb;
 class BoxTreeNode;
 class Iff;
 
-typedef stdvector<BoxTreeNode>::fwd BoxTreeNodeVec;
-typedef stdvector<AxialBox>::fwd BoxVec;
-typedef stdvector<int>::fwd IdVec;
+typedef std::vector<BoxTreeNode> BoxTreeNodeVec;
+typedef std::vector<AxialBox> BoxVec;
+typedef std::vector<int> IdVec;
 
 // ----------------------------------------------------------------------
 

engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.h

@@ -28,8 +28,8 @@ class Range;
 class BoxTree;
 class FloorLocator;
 
-typedef stdvector<Vector>::fwd      VectorVector;
-typedef stdvector<int>::fwd         IntVector;
+typedef std::vector<Vector>      VectorVector;
+typedef std::vector<int>         IntVector;
 
 // ======================================================================
 

engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.h

@@ -28,7 +28,7 @@ class SpatialDatabase;
 class SpatialSubdivisionHandle;
 class Transform;
 
-typedef stdvector<CollisionProperty*>::fwd  ColliderList;
+typedef std::vector<CollisionProperty*>  ColliderList;
 
 // ======================================================================
 

engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h

@@ -65,11 +65,11 @@ struct CellPosition
 };
 
 
-typedef stdvector<CollisionProperty*>::fwd ColliderList;
-typedef stdvector<ObstacleInfo>::fwd ObstacleList;
-typedef stdvector<Contact>::fwd ContactList;
-typedef stdvector<FloorContactShape*>::fwd FloorContactList;
-typedef stdvector<CellPosition>::fwd CellPositionList;
+typedef std::vector<CollisionProperty*> ColliderList;
+typedef std::vector<ObstacleInfo> ObstacleList;
+typedef std::vector<Contact> ContactList;
+typedef std::vector<FloorContactShape*> FloorContactList;
+typedef std::vector<CellPosition> CellPositionList;
 
 struct MoveSegment
 {

engine/shared/library/sharedCollision/src/shared/core/CollisionSurface.h

@@ -52,7 +52,7 @@ struct LineIntersectResult
 	ContactPoint    m_hitLoc;
 };
 
-typedef stdvector<LineIntersectResult>::fwd LineIntersectResultVec;
+typedef std::vector<LineIntersectResult> LineIntersectResultVec;
 
 // ======================================================================
 

engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.h

@@ -28,9 +28,9 @@ class CollisionProperty;
 class MultiShape;
 class BaseExtent;
 
-typedef stdvector<Vector>::fwd VectorVector;
-typedef stdvector<Vector>::fwd VertexList;
-typedef stdvector<BaseExtent const *>::fwd ExtentVec;
+typedef std::vector<Vector> VectorVector;
+typedef std::vector<Vector> VertexList;
+typedef std::vector<BaseExtent const *> ExtentVec;
 
 // ----------------------------------------------------------------------
 

engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.h

@@ -28,9 +28,9 @@ class SpatialDatabase;
 class Sphere;
 class MultiShape;
 
-typedef stdvector<Object*>::fwd             ObjectVec;
-typedef stdvector<CollisionProperty*>::fwd  ColliderList;
-typedef stdvector<Footprint*>::fwd          FootprintList;
+typedef std::vector<Object*>             ObjectVec;
+typedef std::vector<CollisionProperty*>  ColliderList;
+typedef std::vector<Footprint*>          FootprintList;
 
 // ======================================================================
 
@@ -120,7 +120,7 @@ public:
 	
 	// ----------
 	
-	static bool     findLocators        ( CellProperty const * cell, Vector const & point, stdvector<FloorLocator>::fwd & outLocs );
+	static bool     findLocators        ( CellProperty const * cell, Vector const & point, std::vector<FloorLocator> & outLocs );
 	
 	static bool		makeLocator  ( CellProperty const * cell, Vector const & point, FloorLocator & outLoc);
 

engine/shared/library/sharedCollision/src/shared/core/Containment3d.h

@@ -27,7 +27,7 @@ class MultiShape;
 
 #include "sharedCollision/CollisionEnums.h"
 
-typedef stdvector<Vector>::fwd  VectorVector;
+typedef std::vector<Vector>  VectorVector;
 
 // ----------
 // These methods should always be of the form

engine/shared/library/sharedCollision/src/shared/core/Distance3d.h

@@ -26,7 +26,7 @@ class Range;
 class Sphere;
 class MultiShape;
 
-typedef stdvector<Vector>::fwd VertexList;
+typedef std::vector<Vector> VertexList;
 
 #include "sharedCollision/CollisionEnums.h"
 #include "sharedMath/Vector.h"

engine/shared/library/sharedCollision/src/shared/core/DoorObject.h

@@ -21,7 +21,7 @@ class DoorObject;
 class NeighborObject;
 class CollisionProperty;
 
-typedef stdvector<Vector>::fwd VertexList;
+typedef std::vector<Vector> VertexList;
 
 // ----------------------------------------------------------------------
 

engine/shared/library/sharedCollision/src/shared/core/FloorMesh.h

@@ -32,7 +32,7 @@ class Appearance;
 template<class T>
 class DataResourceList;
 typedef DataResourceList<FloorMesh>	 FloorMeshList;
-typedef stdvector<FloorTri>::fwd     FloorTriVec;
+typedef std::vector<FloorTri>     FloorTriVec;
 typedef std::pair<int,int>           IntPair;
 
 class FloorEdgeId
@@ -47,9 +47,9 @@ public:
 	int           edgeId;
 };
 
-typedef stdvector<FloorEdgeId>::fwd FloorEdgeIdVec;
+typedef std::vector<FloorEdgeId> FloorEdgeIdVec;
 
-typedef stdvector<FloorLocator>::fwd FloorLocatorVec;
+typedef std::vector<FloorLocator> FloorLocatorVec;
 
 // ======================================================================
 
@@ -281,7 +281,7 @@ protected:
 
 	typedef std::pair<int,int> EdgeId;
 
-	typedef stdvector<EdgeId>::fwd EdgeIdVec;
+	typedef std::vector<EdgeId> EdgeIdVec;
 
 	void            findAdjacentBoundaryEdges   ( VectorVector const & polyVerts, EdgeIdVec & outIds ) const;
 

engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp

@@ -16,7 +16,7 @@
 
 namespace FootprintForceReattachManagerNamespace
 {
-	typedef stdvector<std::string>::fwd StringVector;
+	typedef std::vector<std::string> StringVector;
 
 	StringVector ms_sceneIds;
 

engine/shared/library/sharedCollision/src/shared/core/Overlap3d.h

@@ -26,7 +26,7 @@ class Range;
 class Cylinder;
 class MultiShape;
 
-typedef stdvector<Vector>::fwd VertexList;
+typedef std::vector<Vector> VertexList;
 
 // ======================================================================
 

engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.h

@@ -29,10 +29,10 @@ class Sphere;
 class Vector;
 class VectorArgb;
 
-typedef stdvector<Floor*>::fwd FloorVec;
-typedef stdvector<Object*>::fwd ObjectVec;
-typedef stdvector<Object const *>::fwd ObjectConstVec;
-typedef stdvector<CollisionProperty*>::fwd  ColliderList;
+typedef std::vector<Floor*> FloorVec;
+typedef std::vector<Object*> ObjectVec;
+typedef std::vector<Object const *> ObjectConstVec;
+typedef std::vector<CollisionProperty*>  ColliderList;
 
 
 template<typename T, typename U>

engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.h

@@ -57,7 +57,7 @@ protected:
 
 	// ----------
 
-	typedef stdvector< BaseExtent * >::fwd ExtentVec;
+	typedef std::vector< BaseExtent * > ExtentVec;
 
 	ExtentVec * m_extents;
 

engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp

@@ -22,7 +22,7 @@
 
 const Tag TAG_CMSH = TAG(C,M,S,H);
 
-typedef stdvector<Vector>::fwd VertexList;
+typedef std::vector<Vector> VertexList;
 
 // ----------------------------------------------------------------------
 

engine/shared/library/sharedCommandParser/src/shared/CommandParser.h

@@ -49,7 +49,7 @@ class CommandParser
 public:
 	
 	typedef Unicode::String          String_t;
-	typedef stdvector<String_t>::fwd StringVector_t;
+	typedef std::vector<String_t> StringVector_t;
 
 	enum ErrorType
 	{
@@ -199,7 +199,7 @@ private:
 	const CommandParser *   m_parent;
 	CommandParser       *   m_delegate;
 
-	typedef stdmap<int, String_t>::fwd ErrorMsgMap_t;
+	typedef std::map<int, String_t> ErrorMsgMap_t;
 
 	static size_t           ms_instanceCount;
 	static String_t *       ms_ERR_NO_ERROR_MSG_MSG;
@@ -216,7 +216,7 @@ private:
 		bool        operator () (const CommandParser * a, const CommandParser * b) const;
 	};
 
-	typedef stdset<CommandParser*, Comparator>::fwd CommandParserSet_t;
+	typedef std::set<CommandParser*, Comparator> CommandParserSet_t;
 
 	CommandParserSet_t *      m_subCommands;
 		

engine/shared/library/sharedCommandParser/src/shared/CommandParserHistory.h

@@ -14,7 +14,7 @@ class CommandParserHistory
 {
 public:
 
-	typedef stddeque<Unicode::String>::fwd   HistoryList_t;
+	typedef std::deque<Unicode::String>   HistoryList_t;
 
 	                         CommandParserHistory ();
 	                        ~CommandParserHistory ();

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbProfiler.h

@@ -33,7 +33,7 @@ namespace DB
 			int m_fetchCount;
 		};
 
-		typedef stdmap<std::string, QueryData>::fwd QueryDataMapType;
+		typedef std::map<std::string, QueryData> QueryDataMapType;
 		QueryDataMapType *m_queryDataMap;
 	};
 	

engine/shared/library/sharedDebug/src/shared/DataLint.cpp

@@ -27,9 +27,9 @@ namespace DataLintNamespace
 		M_server
 	};
 
-	typedef stdvector<std::string>::fwd                               StringList;
+	typedef std::vector<std::string>                               StringList;
 	typedef std::pair<std::string, std::pair<DataLint::AssetType, StringList> > WarningPair;
-	typedef stdvector<WarningPair>::fwd                               WarningList;
+	typedef std::vector<WarningPair>                               WarningList;
 	typedef bool(*AssetFunction)(char const *);
 
 	bool                       ms_installed = false;

engine/shared/library/sharedDebug/src/shared/DataLint.h

@@ -14,7 +14,7 @@ class DataLint
 {
 public:
 
-	typedef stdvector<std::pair<std::string, std::string> >::fwd StringPairList;
+	typedef std::vector<std::pair<std::string, std::string> > StringPairList;
 
 public:
 

engine/shared/library/sharedDebug/src/shared/DebugFlags.h

@@ -62,7 +62,7 @@ private:
 
 private:
 
-	typedef stdvector<Flag>::fwd FlagVector;
+	typedef std::vector<Flag> FlagVector;
 
 	static FlagVector ms_flagsSortedByName;
 	static FlagVector ms_flagsSortedByReportPriority;

engine/shared/library/sharedDebug/src/shared/DebugKey.h

@@ -41,7 +41,7 @@ private:
 		bool operator <(const Flag &rhs) const;
 	};
 
-	typedef stdvector<Flag>::fwd FlagVector;
+	typedef std::vector<Flag> FlagVector;
 
 private:
 

engine/shared/library/sharedDebug/src/shared/RemoteDebug.h

@@ -159,15 +159,15 @@ protected:
 	static SendFunction            ms_sendFunction;
 	static IsReadyFunction         ms_isReadyFunction;
 
-	typedef stdmap<uint32, Channel *>::fwd StreamMap;
+	typedef std::map<uint32, Channel *> StreamMap;
 	///stream names
 	static  StreamMap                *ms_streams;
 
-	typedef stdmap<uint32, Channel *>::fwd VariableMap;
+	typedef std::map<uint32, Channel *> VariableMap;
 	///What variables are registered
 	static  VariableMap              *ms_variables;
 
-	typedef stdmap<uint32, Channel *>::fwd StaticViewMap;
+	typedef std::map<uint32, Channel *> StaticViewMap;
 	///StaticView names
 	static  StaticViewMap            *ms_staticViews;
 
@@ -184,10 +184,10 @@ protected:
 	static bool                      ms_opened;
 
 	///What streaming channels are squelched (i.e. don't send to client at all)
-	static stdmap<uint32, bool>::fwd      *ms_squelchedStream;
+	static std::map<uint32, bool>      *ms_squelchedStream;
 
 	///What static channels are squelched (i.e. don't send to client at all)
-	static stdmap<uint32, bool>::fwd      *ms_squelchedStatic;
+	static std::map<uint32, bool>      *ms_squelchedStatic;
 
 	///the next stream number
 	static uint32                    ms_nextStream;
@@ -198,10 +198,10 @@ protected:
 	///the next staticView number
 	static uint32                    ms_nextStaticView;
 
-	typedef stdmap<uint32, Variable *>::fwd VariableValueMap;
+	typedef std::map<uint32, Variable *> VariableValueMap;
 	static VariableValueMap            *ms_variableValues;
 
-	typedef stdmap<uint32, UpFunction>::fwd MovementFunctionMap;
+	typedef std::map<uint32, UpFunction> MovementFunctionMap;
 	static MovementFunctionMap         *ms_upFunctionMap;
 	static MovementFunctionMap         *ms_downFunctionMap;
 	static MovementFunctionMap         *ms_leftFunctionMap;

engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h

@@ -24,7 +24,7 @@ class RemoteDebug::Channel
 		void addChild(Channel *child);
 		const std::string& name();
 	private:
-		typedef stdlist<Channel *>::fwd NodeList;
+		typedef std::list<Channel *> NodeList;
 		///its children
 		NodeList* m_children;
 		///the fully qualified name of the channel

engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp

@@ -48,7 +48,7 @@ namespace AsynchronousLoaderNamespace
 		AsynchronousLoader::FetchFunction    fetchFunction;
 		AsynchronousLoader::ReleaseFunction  releaseFunction;
 	};
-	typedef stdvector<ExtensionFunctions>::fwd ExtensionFunctionsList;
+	typedef std::vector<ExtensionFunctions> ExtensionFunctionsList;
 
 	struct FileRecord
 	{
@@ -61,7 +61,7 @@ namespace AsynchronousLoaderNamespace
 		FileRecord();
 		FileRecord &operator =(const FileRecord &);
 	};
-	typedef stdvector<FileRecord *>::fwd FileRecordList;
+	typedef std::vector<FileRecord *> FileRecordList;
 
 	class FileMapComparison
 	{
@@ -69,7 +69,7 @@ namespace AsynchronousLoaderNamespace
 		bool operator ()(const char *lhs, const char *rhs) const;
 	};
 
-	typedef stdmap<const char *, FileRecordList *, FileMapComparison>::fwd  FileMap;
+	typedef std::map<const char *, FileRecordList *, FileMapComparison>  FileMap;
 
 	struct CachedFile
 	{
@@ -77,8 +77,8 @@ namespace AsynchronousLoaderNamespace
 		AbstractFile *file;
 		const void   *resource;
 	};
-	typedef stdvector<CachedFile>::fwd   CachedFiles;
-	typedef stdvector<CachedFiles*>::fwd CachedFilesPool;
+	typedef std::vector<CachedFile>   CachedFiles;
+	typedef std::vector<CachedFiles*> CachedFilesPool;
 
 	struct Request
 	{
@@ -87,7 +87,7 @@ namespace AsynchronousLoaderNamespace
 		void                           *data;
 		CachedFiles                    *cachedFiles;
 	};
-	typedef stddeque<Request *>::fwd  Requests;
+	typedef std::deque<Request *>  Requests;
 
 	void remove();
 	void submitRequest(Request *request);

engine/shared/library/sharedFile/src/shared/TreeFile.h

@@ -104,7 +104,7 @@ public:
 
 private:
 
-	typedef stdvector<SearchNode *>::fwd  SearchNodes;
+	typedef std::vector<SearchNode *>  SearchNodes;
 
 private:
 

engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.h

@@ -337,7 +337,7 @@ private:
 private:
 
 	class CachedFile;
-	typedef stdmap<CrcString const *, CachedFile *, LessPointerComparator>::fwd CachedFileMap;
+	typedef std::map<CrcString const *, CachedFile *, LessPointerComparator> CachedFileMap;
 	CachedFileMap * const m_cachedFileMap;
 };
 

engine/shared/library/sharedFoundation/src/shared/ConfigFile.h

@@ -43,7 +43,7 @@ public:
 		/// a buffer holding the entry string, which may be recast to other types
 		char       *m_entry;
 	};
-	typedef stdlist<Element *>::fwd ElementList;
+	typedef std::list<Element *> ElementList;
 
 	// -----------------------------------------------------------------------
 
@@ -80,7 +80,7 @@ public:
 		/// track whether this was added lazily (not explicitly in the config file)
 		bool m_lazyAdd;
 	};
-	typedef stdmap<const char *, Key *, StringCompare>::fwd KeyMap;
+	typedef std::map<const char *, Key *, StringCompare> KeyMap;
 
 	// -----------------------------------------------------------------------
 
@@ -124,7 +124,7 @@ public:
 		///String representation of the section's name
 		char* m_name;
 	};
-	typedef stdmap<const char *, Section *, StringCompare>::fwd SectionMap;
+	typedef std::map<const char *, Section *, StringCompare> SectionMap;
 
 public:
 	//public interface

engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp

@@ -169,7 +169,7 @@ ConstCharCrcString const CrcStringTable::lookUp(uint32 crc) const
 
 // ----------------------------------------------------------------------
 
-void CrcStringTable::getAllStrings(stdvector<const char *>::fwd & strings) const
+void CrcStringTable::getAllStrings(std::vector<const char *> & strings) const
 {
 	strings.reserve(strings.size() + m_numberOfEntries);
 

engine/shared/library/sharedFoundation/src/shared/CrcStringTable.h

@@ -30,7 +30,7 @@ public:
 	ConstCharCrcString const lookUp(const char * string) const;
 	ConstCharCrcString const lookUp(uint32 crc) const;
 
-	void getAllStrings(stdvector<const char *>::fwd & strings) const;
+	void getAllStrings(std::vector<const char *> & strings) const;
 
 	int getNumberOfStrings() const;
 	ConstCharCrcString const getString(int index) const;

engine/shared/library/sharedFoundation/src/shared/DebugInfoManager.h

@@ -19,8 +19,8 @@ class Vector;
 class DebugInfoManager
 {
 public:
-	typedef stdmap<std::string, Unicode::String>::fwd PropertySection;
-	typedef stdmap<std::string, PropertySection>::fwd PropertyMap;
+	typedef std::map<std::string, Unicode::String> PropertySection;
+	typedef std::map<std::string, PropertySection> PropertyMap;
 
 public:
 	static void addProperty(PropertyMap & propertyMap, std::string const & section, std::string const & propertyName, int propertyValue);

engine/shared/library/sharedFoundation/src/shared/MessageQueue.h

@@ -74,7 +74,7 @@ private:
 
 private:
 
-	typedef stdvector<Message>::fwd MessageList;
+	typedef std::vector<Message> MessageList;
 
 private:
 

engine/shared/library/sharedFoundation/src/shared/Scheduler.h

@@ -91,8 +91,8 @@ private:
 
 private:
 
-	stdvector<StaticCallbackEntry *>::fwd * deferredCallbackEntryAdditions;
-	stdpriority_queue<StaticCallbackEntry *, std::vector<StaticCallbackEntry *, std::allocator<StaticCallbackEntry *> >, StaticCallbackEntry::Compare>::fwd * callbackQueue;
+	std::vector<StaticCallbackEntry *> * deferredCallbackEntryAdditions;
+	std::priority_queue<StaticCallbackEntry *, std::vector<StaticCallbackEntry *, std::allocator<StaticCallbackEntry *> >, StaticCallbackEntry::Compare> * callbackQueue;
 
 private:
 

engine/shared/library/sharedFoundation/src/shared/StaticCallbackEntry.h

@@ -48,7 +48,7 @@ private:
 
 private:
 
-	static stdvector<StaticCallbackEntry *>::fwd & getStaticCallbackFreeList();
+	static std::vector<StaticCallbackEntry *> & getStaticCallbackFreeList();
 
 private:
 

engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h

@@ -8,131 +8,13 @@
 #ifndef INCLUDED_StlForwardDeclaration_H
 #define INCLUDED_StlForwardDeclaration_H
 
-// ======================================================================
-
-// Setup handling for template value defaults that require accessing the
-// {template type}::fwd value.  gcc 3.2 requires typename here, gcc 2.95
-// optionally accepts typename here, msvc 6 will not accept it here.
-
-#if defined(PLATFORM_WIN32) || defined(WIN32)
-
-#define FORWARD_TYPENAME
-
-#elif defined(PLATFORM_LINUX)
-
-#define FORWARD_TYPENAME  typename
-
-#else
-
-#error unsupported platform
-
-#endif
-
-// ======================================================================
-
-// grab stlport configuration
-//#include "stl/config/features.h" // uncomment for newer stlport versions
-//#include "stl/_config.h"
-
-namespace std
-{
-	template <class _Tp>                                                                struct less;
-	template <class _Tp>                                                                struct equal_to;
-	template <class _T1, class _T2>                                                     struct pair;
-	template <class _T1>                                                                struct hash;
-	template <class _Tp>                                                                class  allocator;
-	template <class _CharT, class _Traits, class _Alloc>                                class  basic_string;
-	template <class _CharT>                                                             struct  char_traits;
-
-	template <size_t _Nb>                                                               class  bitset;
-	template <class _Tp, class _Alloc>                                                  class  deque;
-	template <class _Tp, class _Alloc>                                                  class  list;
-	template <class _Tp, class _Alloc>                                                  class  queue;
-	template <class _Tp, class _Alloc>                                                  class  vector;
-	template <class _Tp, class _Sequence>                                               class  stack;
-	template <class _Tp, class _Container, class _Compare>                              class  priority_queue;
-	template <class _Key, class _Tp, class _Compare, class _Alloc>                      class  map;
-	//template <class _Key, class _Tp, class _HashFcn, class _Compare, class _Alloc>      class  hash_map;
-	template <class _Key, class _Tp, class _Compare, class _Alloc>                      class  multimap;
-	template <class _Key, class _Compare, class _Alloc>                                 class  set;
-	//template <class _Key, class _HashFcn, class _Compare, class _Alloc>                 class  hash_set;
-	template <class _Key, class _Compare, class _Alloc>                                 class  multiset;
-
-	typedef basic_string<char, char_traits<char>, allocator<char> >                     string;
-
-	template <class _Key, class _Tp, class _Hash, class _Compare, class _Alloc> 		class unordered_map;
-	template <class _Key, class _Hash, class _Compare, class _Alloc> 					class unordered_set;
-}
-
-template <class _Tp, class _Alloc = std::allocator<_Tp> > struct stddeque
-{
-	typedef std::deque<_Tp, _Alloc> fwd;
-};
-
-template <class _Tp, class _Alloc = std::allocator<_Tp> > struct stdlist
-{
-	typedef std::list<_Tp, _Alloc> fwd;
-};
-
-template <class _Key, class _Tp, class _Compare = std::less<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdmap
-{
-	typedef std::map<_Key, _Tp, _Compare, _Alloc> fwd;
-};
-
-//template <class _Key, class _Tp, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdhash_map
-//{
-//	typedef std::hash_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd;
-//};
-
-template <class _Key, class _Tp, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdunordered_map
-{
-	typedef std::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd;
-};
-
-template <class _Key, class _Tp, class _Compare = std::less<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdmultimap
-{
-	typedef std::multimap<_Key, _Tp, _Compare, _Alloc> fwd;
-};
-
-template <class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> > struct stdset
-{
-	typedef std::set<_Key, _Compare, _Alloc> fwd;
-};
-
-//template <class _Key, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdhash_set
-//{
-//	typedef std::hash_set<_Key, _HashFcn, _Compare, _Alloc> fwd;
-//};
-
-template <class _Key, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set
-{
-	typedef std::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd;
-};
-
-template <class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> > struct stdmultiset
-{
-	typedef std::multiset<_Key, _Compare, _Alloc> fwd;
-};
-
-template <class _Tp, class _Alloc = std::allocator<_Tp> > struct stdvector
-{
-	typedef std::vector<_Tp, _Alloc> fwd;
-};
-
-template <class _Tp, class _Container = FORWARD_TYPENAME stdvector<_Tp>::fwd, class _Compare = std::less<typename _Container::value_type> > struct stdpriority_queue
-{
-	typedef std::priority_queue<_Tp, _Container, _Compare> fwd;
-};
-
-template <class _Tp, class _Sequence = FORWARD_TYPENAME stddeque<_Tp>::fwd > struct stdqueue
-{
-	typedef std::queue<_Tp, _Sequence> fwd;
-};
-
-template <class _Tp, class _Sequence = FORWARD_TYPENAME stddeque<_Tp>::fwd > struct stdstack
-{
-	typedef std::stack<_Tp, _Sequence> fwd;
-};
+#include <vector>
+#include <map>
+#include <unordered_map>
+#include <unordered_set>
+#include <set>
+#include <queue>
+#include <list>
 
 namespace Unicode
 {

engine/shared/library/sharedFoundation/src/shared/Watcher.cpp

@@ -18,8 +18,8 @@
 
 namespace WatchedByListNamespace
 {
-	typedef stdvector<BaseWatcher *>::fwd List;
-	typedef stdvector<List *>::fwd ListList;
+	typedef std::vector<BaseWatcher *> List;
+	typedef std::vector<List *> ListList;
 
 	ListList ms_listList;
 

engine/shared/library/sharedFoundation/src/shared/Watcher.h

@@ -151,7 +151,7 @@ private:
 
 private:
 
-	typedef stdvector<BaseWatcher *>::fwd List;
+	typedef std::vector<BaseWatcher *> List;
 
 private:
 

engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h

@@ -62,59 +62,59 @@ class DynamicVariable
 	void setPosition(int newPosition);
 
 	explicit DynamicVariable(int value);
-	explicit DynamicVariable(const stdvector<int>::fwd & value);
+	explicit DynamicVariable(const std::vector<int> & value);
 	explicit DynamicVariable(float value);
-	explicit DynamicVariable(const stdvector<float>::fwd & value);
+	explicit DynamicVariable(const std::vector<float> & value);
 	explicit DynamicVariable(const Unicode::String &value);
 	explicit DynamicVariable(const std::string &value);
-	explicit DynamicVariable(const stdvector<Unicode::String>::fwd & value);
+	explicit DynamicVariable(const std::vector<Unicode::String> & value);
 	explicit DynamicVariable(const NetworkId & value);
-	explicit DynamicVariable(const stdvector<NetworkId>::fwd & value);
+	explicit DynamicVariable(const std::vector<NetworkId> & value);
 	explicit DynamicVariable(const DynamicVariableLocationData & value);
-	explicit DynamicVariable(const stdvector<DynamicVariableLocationData>::fwd & value);
+	explicit DynamicVariable(const std::vector<DynamicVariableLocationData> & value);
 	explicit DynamicVariable(const StringId &value);
-	explicit DynamicVariable(const stdvector<StringId>::fwd &value);
+	explicit DynamicVariable(const std::vector<StringId> &value);
 	explicit DynamicVariable(const Transform &value);
-	explicit DynamicVariable(const stdvector<Transform>::fwd &value);
+	explicit DynamicVariable(const std::vector<Transform> &value);
 	explicit DynamicVariable(const Vector &value);
-	explicit DynamicVariable(const stdvector<Vector>::fwd &value);
+	explicit DynamicVariable(const std::vector<Vector> &value);
 
 	bool get(int & value) const;
-	bool get(stdvector<int>::fwd & value) const;
+	bool get(std::vector<int> & value) const;
 	bool get(float & value) const;
-	bool get(stdvector<float>::fwd & value) const;
+	bool get(std::vector<float> & value) const;
 	bool get(Unicode::String & value) const;
 	bool get(std::string & value) const;
-	bool get(stdvector<Unicode::String>::fwd & value) const;
+	bool get(std::vector<Unicode::String> & value) const;
 	bool get(NetworkId & value) const;
-	bool get(stdvector<NetworkId>::fwd & value) const;
+	bool get(std::vector<NetworkId> & value) const;
 	bool get(DynamicVariableLocationData & value) const;
-	bool get(stdvector<DynamicVariableLocationData>::fwd & value) const;
+	bool get(std::vector<DynamicVariableLocationData> & value) const;
 	bool get(StringId &value) const;
-	bool get(stdvector<StringId>::fwd &value) const;
+	bool get(std::vector<StringId> &value) const;
 	bool get(Transform &value) const;
-	bool get(stdvector<Transform>::fwd &value) const;
+	bool get(std::vector<Transform> &value) const;
 	bool get(Vector &value) const;
-	bool get(stdvector<Vector>::fwd &value) const;
+	bool get(std::vector<Vector> &value) const;
 
 	       int getUTF8Length() const;
 	static int getUTF8Length(const int & value);
-	static int getUTF8Length(const stdvector<int>::fwd & value);
+	static int getUTF8Length(const std::vector<int> & value);
 	static int getUTF8Length(const float & value);
-	static int getUTF8Length(const stdvector<float>::fwd & value);
+	static int getUTF8Length(const std::vector<float> & value);
 	static int getUTF8Length(const Unicode::String &value);
 	static int getUTF8Length(const std::string &value);
-	static int getUTF8Length(const stdvector<Unicode::String>::fwd & value);
+	static int getUTF8Length(const std::vector<Unicode::String> & value);
 	static int getUTF8Length(const NetworkId & value);
-	static int getUTF8Length(const stdvector<NetworkId>::fwd & value);
+	static int getUTF8Length(const std::vector<NetworkId> & value);
 	static int getUTF8Length(const DynamicVariableLocationData & value);
-	static int getUTF8Length(const stdvector<DynamicVariableLocationData>::fwd & value);
+	static int getUTF8Length(const std::vector<DynamicVariableLocationData> & value);
 	static int getUTF8Length(const StringId &value);
-	static int getUTF8Length(const stdvector<StringId>::fwd &value);
+	static int getUTF8Length(const std::vector<StringId> &value);
 	static int getUTF8Length(const Transform &value);
-	static int getUTF8Length(const stdvector<Transform>::fwd &value);
+	static int getUTF8Length(const std::vector<Transform> &value);
 	static int getUTF8Length(const Vector &value);
-	static int getUTF8Length(const stdvector<Vector>::fwd &value);
+	static int getUTF8Length(const std::vector<Vector> &value);
 
 public:
 	// functions used for persistence:
@@ -125,22 +125,22 @@ public:
 private:
 
 	static void pack(int value, Unicode::String & packedData);
-	static void pack(const stdvector<int>::fwd & value, Unicode::String & packedData);
+	static void pack(const std::vector<int> & value, Unicode::String & packedData);
 	static void pack(float value, Unicode::String & packedData);
-	static void pack(const stdvector<float>::fwd & value, Unicode::String & packedData);
+	static void pack(const std::vector<float> & value, Unicode::String & packedData);
 	static void pack(const Unicode::String &value, Unicode::String & packedData);
 	static void pack(const std::string &value, Unicode::String & packedData);
-	static void pack(const stdvector<Unicode::String>::fwd & value, Unicode::String & packedData);
+	static void pack(const std::vector<Unicode::String> & value, Unicode::String & packedData);
 	static void pack(const NetworkId & value, Unicode::String & packedData);
-	static void pack(const stdvector<NetworkId>::fwd & value, Unicode::String & packedData);
+	static void pack(const std::vector<NetworkId> & value, Unicode::String & packedData);
 	static void pack(const DynamicVariableLocationData & value, Unicode::String & packedData);
-	static void pack(const stdvector<DynamicVariableLocationData>::fwd & value, Unicode::String & packedData);
+	static void pack(const std::vector<DynamicVariableLocationData> & value, Unicode::String & packedData);
 	static void pack(const StringId &value, Unicode::String & packedData);
-	static void pack(const stdvector<StringId>::fwd &value, Unicode::String & packedData);
+	static void pack(const std::vector<StringId> &value, Unicode::String & packedData);
 	static void pack(const Transform &value, Unicode::String & packedData);
-	static void pack(const stdvector<Transform>::fwd &value, Unicode::String & packedData);
+	static void pack(const std::vector<Transform> &value, Unicode::String & packedData);
 	static void pack(const Vector &value, Unicode::String & packedData);
-	static void pack(const stdvector<Vector>::fwd &value, Unicode::String & packedData);
+	static void pack(const std::vector<Vector> &value, Unicode::String & packedData);
 
 private:
 	DynamicVariableType m_type;

engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.cpp

@@ -221,22 +221,22 @@ bool DynamicVariableList::getItem(const std::string &name,  T &value) const \
 }
 
 GET_ITEM(int)
-GET_ITEM(stdvector<int>::fwd)
+GET_ITEM(std::vector<int>)
 GET_ITEM(float)
-GET_ITEM(stdvector<float>::fwd)
+GET_ITEM(std::vector<float>)
 GET_ITEM(Unicode::String)
 GET_ITEM(std::string)
-GET_ITEM(stdvector<Unicode::String>::fwd)
+GET_ITEM(std::vector<Unicode::String>)
 GET_ITEM(NetworkId)
-GET_ITEM(stdvector<NetworkId>::fwd)
+GET_ITEM(std::vector<NetworkId>)
 GET_ITEM(DynamicVariableLocationData)
-GET_ITEM(stdvector<DynamicVariableLocationData>::fwd)
+GET_ITEM(std::vector<DynamicVariableLocationData>)
 GET_ITEM(StringId)
-GET_ITEM(stdvector<StringId>::fwd)
+GET_ITEM(std::vector<StringId>)
 GET_ITEM(Transform)
-GET_ITEM(stdvector<Transform>::fwd)
+GET_ITEM(std::vector<Transform>)
 GET_ITEM(Vector)
-GET_ITEM(stdvector<Vector>::fwd)
+GET_ITEM(std::vector<Vector>)
 
 // ======================================================================
 // DynamicVariableList setters
@@ -250,22 +250,22 @@ bool DynamicVariableList::setItem(const std::string &name, const T &value) \
 }
 
 SET_ITEM(int)
-SET_ITEM(stdvector<int>::fwd)
+SET_ITEM(std::vector<int>)
 SET_ITEM(float)
-SET_ITEM(stdvector<float>::fwd)
+SET_ITEM(std::vector<float>)
 SET_ITEM(Unicode::String)
 SET_ITEM(std::string)
-SET_ITEM(stdvector<Unicode::String>::fwd)
+SET_ITEM(std::vector<Unicode::String>)
 SET_ITEM(NetworkId)
-SET_ITEM(stdvector<NetworkId>::fwd)
+SET_ITEM(std::vector<NetworkId>)
 SET_ITEM(DynamicVariableLocationData)
-SET_ITEM(stdvector<DynamicVariableLocationData>::fwd)
+SET_ITEM(std::vector<DynamicVariableLocationData>)
 SET_ITEM(StringId)
-SET_ITEM(stdvector<StringId>::fwd)
+SET_ITEM(std::vector<StringId>)
 SET_ITEM(Transform)
-SET_ITEM(stdvector<Transform>::fwd)
+SET_ITEM(std::vector<Transform>)
 SET_ITEM(Vector)
-SET_ITEM(stdvector<Vector>::fwd)
+SET_ITEM(std::vector<Vector>)
 
 bool DynamicVariableList::setItem(const std::string &name, DynamicVariable value) 
 {

engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableList.h

@@ -52,40 +52,40 @@ public:
 	size_t size() const;
 
 	bool getItem(const std::string &name,int & value) const;
-	bool getItem(const std::string &name,stdvector<int>::fwd & value) const;
+	bool getItem(const std::string &name,std::vector<int> & value) const;
 	bool getItem(const std::string &name,float & value) const;
-	bool getItem(const std::string &name,stdvector<float>::fwd & value) const;
+	bool getItem(const std::string &name,std::vector<float> & value) const;
 	bool getItem(const std::string &name,Unicode::String & value) const;
 	bool getItem(const std::string &name,std::string & value) const;
-	bool getItem(const std::string &name,stdvector<Unicode::String>::fwd & value) const;
+	bool getItem(const std::string &name,std::vector<Unicode::String> & value) const;
 	bool getItem(const std::string &name,NetworkId & value) const;
-	bool getItem(const std::string &name,stdvector<NetworkId>::fwd & value) const;
+	bool getItem(const std::string &name,std::vector<NetworkId> & value) const;
 	bool getItem(const std::string &name,DynamicVariableLocationData & value) const;
-	bool getItem(const std::string &name,stdvector<DynamicVariableLocationData>::fwd & value) const;
+	bool getItem(const std::string &name,std::vector<DynamicVariableLocationData> & value) const;
 	bool getItem(const std::string &name,StringId &value) const;
-	bool getItem(const std::string &name,stdvector<StringId>::fwd &value) const;
+	bool getItem(const std::string &name,std::vector<StringId> &value) const;
 	bool getItem(const std::string &name,Transform &value) const;
-	bool getItem(const std::string &name,stdvector<Transform>::fwd &value) const;
+	bool getItem(const std::string &name,std::vector<Transform> &value) const;
 	bool getItem(const std::string &name,Vector &value) const;
-	bool getItem(const std::string &name,stdvector<Vector>::fwd &value) const;
+	bool getItem(const std::string &name,std::vector<Vector> &value) const;
 
 	bool setItem(const std::string &name, const int & value);
-	bool setItem(const std::string &name, const stdvector<int>::fwd & value);
+	bool setItem(const std::string &name, const std::vector<int> & value);
 	bool setItem(const std::string &name, const float & value);
-	bool setItem(const std::string &name, const stdvector<float>::fwd & value);
+	bool setItem(const std::string &name, const std::vector<float> & value);
 	bool setItem(const std::string &name, const Unicode::String & value);
 	bool setItem(const std::string &name, const std::string & value);
-	bool setItem(const std::string &name, const stdvector<Unicode::String>::fwd & value);
+	bool setItem(const std::string &name, const std::vector<Unicode::String> & value);
 	bool setItem(const std::string &name, const NetworkId & value);
-	bool setItem(const std::string &name, const stdvector<NetworkId>::fwd & value);
+	bool setItem(const std::string &name, const std::vector<NetworkId> & value);
 	bool setItem(const std::string &name, const DynamicVariableLocationData & value);
-	bool setItem(const std::string &name, const stdvector<DynamicVariableLocationData>::fwd & value);
+	bool setItem(const std::string &name, const std::vector<DynamicVariableLocationData> & value);
 	bool setItem(const std::string &name, const StringId &value);
-	bool setItem(const std::string &name, const stdvector<StringId>::fwd &value);
+	bool setItem(const std::string &name, const std::vector<StringId> &value);
 	bool setItem(const std::string &name, const Transform &value);
-	bool setItem(const std::string &name, const stdvector<Transform>::fwd &value);
+	bool setItem(const std::string &name, const std::vector<Transform> &value);
 	bool setItem(const std::string &name, const Vector &value);
-	bool setItem(const std::string &name, const stdvector<Vector>::fwd &value);
+	bool setItem(const std::string &name, const std::vector<Vector> &value);
 	bool setItem(const std::string &name, DynamicVariable value);
 
 	int getRevision() const;

engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.cpp

@@ -183,22 +183,22 @@ bool DynamicVariableListNestedList::getItem(const std::string &name, T &value) c
 }
 
 NESTED_LIST_GET_ITEM(int)
-NESTED_LIST_GET_ITEM(stdvector<int>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<int>)
 NESTED_LIST_GET_ITEM(float)
-NESTED_LIST_GET_ITEM(stdvector<float>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<float>)
 NESTED_LIST_GET_ITEM(Unicode::String)
 NESTED_LIST_GET_ITEM(std::string)
-NESTED_LIST_GET_ITEM(stdvector<Unicode::String>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<Unicode::String>)
 NESTED_LIST_GET_ITEM(NetworkId)
-NESTED_LIST_GET_ITEM(stdvector<NetworkId>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<NetworkId>)
 NESTED_LIST_GET_ITEM(DynamicVariableLocationData)
-NESTED_LIST_GET_ITEM(stdvector<DynamicVariableLocationData>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<DynamicVariableLocationData>)
 NESTED_LIST_GET_ITEM(StringId)
-NESTED_LIST_GET_ITEM(stdvector<StringId>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<StringId>)
 NESTED_LIST_GET_ITEM(Transform)
-NESTED_LIST_GET_ITEM(stdvector<Transform>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<Transform>)
 NESTED_LIST_GET_ITEM(Vector)
-NESTED_LIST_GET_ITEM(stdvector<Vector>::fwd)
+NESTED_LIST_GET_ITEM(std::vector<Vector>)
 
 // ======================================================================
 // DynamicVariableListNestedList::const_iterator
@@ -308,20 +308,20 @@ bool DynamicVariableListNestedList::const_iterator::getValue(T &value) const \
 }
 
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(int)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<int>::fwd)
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<int>)
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(float)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<float>::fwd)
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<float>)
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(Unicode::String)
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::string)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<Unicode::String>::fwd)
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<Unicode::String>)
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(NetworkId)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<NetworkId>::fwd)
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<NetworkId>)
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(DynamicVariableLocationData)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<DynamicVariableLocationData>::fwd)
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<DynamicVariableLocationData>)
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(StringId)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<StringId>::fwd) 
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<StringId>) 
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(Transform)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<Transform>::fwd) 
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<Transform>) 
 NESTED_LIST_CONST_ITERATOR_GET_VALUE(Vector)
-NESTED_LIST_CONST_ITERATOR_GET_VALUE(stdvector<Vector>::fwd) 
+NESTED_LIST_CONST_ITERATOR_GET_VALUE(std::vector<Vector>) 
 //======================================================================

engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariableListNestedList.h

@@ -58,22 +58,22 @@ public:
 		bool                                 operator!=       (const const_iterator &rhs) const;
 
 		bool getValue (int & value) const;
-		bool getValue (stdvector<int>::fwd & value) const;
+		bool getValue (std::vector<int> & value) const;
 		bool getValue (float & value) const;
-		bool getValue (stdvector<float>::fwd & value) const;
+		bool getValue (std::vector<float> & value) const;
 		bool getValue (Unicode::String & value) const;
 		bool getValue (std::string & value) const;
-		bool getValue (stdvector<Unicode::String>::fwd & value) const;
+		bool getValue (std::vector<Unicode::String> & value) const;
 		bool getValue (NetworkId & value) const;
-		bool getValue (stdvector<NetworkId>::fwd & value) const;
+		bool getValue (std::vector<NetworkId> & value) const;
 		bool getValue (DynamicVariableLocationData & value) const;
-		bool getValue (stdvector<DynamicVariableLocationData>::fwd & value) const;
+		bool getValue (std::vector<DynamicVariableLocationData> & value) const;
 		bool getValue (StringId &value) const;
-		bool getValue (stdvector<StringId>::fwd &value) const;
+		bool getValue (std::vector<StringId> &value) const;
 		bool getValue (Transform &value) const;
-		bool getValue (stdvector<Transform>::fwd &value) const;
+		bool getValue (std::vector<Transform> &value) const;
 		bool getValue (Vector &value) const;
-		bool getValue (stdvector<Vector>::fwd &value) const;
+		bool getValue (std::vector<Vector> &value) const;
 
 	private:
 		const DynamicVariableListNestedList &   m_context;
@@ -103,22 +103,22 @@ public:
 	const_iterator      getItemByPosition (int position) const;
 	
 	bool getItem (const std::string &name,int & value) const;
-	bool getItem (const std::string &name,stdvector<int>::fwd & value) const;
+	bool getItem (const std::string &name,std::vector<int> & value) const;
 	bool getItem (const std::string &name,float & value) const;
-	bool getItem (const std::string &name,stdvector<float>::fwd & value) const;
+	bool getItem (const std::string &name,std::vector<float> & value) const;
 	bool getItem (const std::string &name,Unicode::String & value) const;
 	bool getItem (const std::string &name,std::string & value) const;
-	bool getItem (const std::string &name,stdvector<Unicode::String>::fwd & value) const;
+	bool getItem (const std::string &name,std::vector<Unicode::String> & value) const;
 	bool getItem (const std::string &name,NetworkId & value) const;
-	bool getItem (const std::string &name,stdvector<NetworkId>::fwd & value) const;
+	bool getItem (const std::string &name,std::vector<NetworkId> & value) const;
 	bool getItem (const std::string &name,DynamicVariableLocationData & value) const;
-	bool getItem (const std::string &name,stdvector<DynamicVariableLocationData>::fwd & value) const;
+	bool getItem (const std::string &name,std::vector<DynamicVariableLocationData> & value) const;
 	bool getItem (const std::string &name,StringId &value) const;
-	bool getItem (const std::string &name,stdvector<StringId>::fwd &value) const;
+	bool getItem (const std::string &name,std::vector<StringId> &value) const;
 	bool getItem (const std::string &name,Transform &value) const;
-	bool getItem (const std::string &name,stdvector<Transform>::fwd &value) const;
+	bool getItem (const std::string &name,std::vector<Transform> &value) const;
 	bool getItem (const std::string &name,Vector &value) const;
-	bool getItem (const std::string &name,stdvector<Vector>::fwd &value) const;
+	bool getItem (const std::string &name,std::vector<Vector> &value) const;
 	
 private:
 	const DynamicVariableList & m_list;

engine/shared/library/sharedFoundation/src/win32/Os.h

@@ -27,7 +27,7 @@ public:
 	typedef void (*QueueCharacterHookFunction)(int keyboard, int character);
 	typedef void (*SetSystemMouseCursorPositionHookFunction)(int x, int y);
 	typedef bool (*GetHardwareMouseCursorEnabled)();
-	typedef void (*GetOtherAdapterRectsHookFunction)(stdvector<RECT>::fwd &);
+	typedef void (*GetOtherAdapterRectsHookFunction)(std::vector<RECT> &);
 	typedef void (*WindowPositionChangedHookFunction)();
 	typedef void (*DisplayModeChangedHookFunction)();
 	typedef void (*InputLanguageChangedHookFunction)();

engine/shared/library/sharedGame/src/shared/command/CommandTable.h

@@ -22,9 +22,9 @@ class Command;
 class CommandTable // static class
 {
 public:
-	typedef stdmap<uint32, Command>::fwd CommandMap;
+	typedef std::map<uint32, Command> CommandMap;
 
-	static void                loadCommandTables  (stdvector<std::string>::fwd const &commandTableFilenames);
+	static void                loadCommandTables  (std::vector<std::string> const &commandTableFilenames);
 	static void                addCppFunction     (std::string const &funcName, CommandCppFunc::Type func);
 	static Command const &     getCommand         (uint32 commandHash);
 	static CommandMap const &  getCommandMap      ();

engine/shared/library/sharedGame/src/shared/core/AiDebugString.h

@@ -23,13 +23,13 @@ class AiDebugString
 {
 public:
 
-	typedef stdvector<Transform>::fwd TransformList;
-	typedef stdvector<std::string>::fwd TextList;
-	typedef stdvector<std::pair<CachedNetworkId, std::pair<Vector, PackedRgb> > >::fwd LineList;
-	typedef stdvector<std::pair<TransformList, bool/*cyclic*/> >::fwd PathList;
-	typedef stdvector<std::pair<CachedNetworkId, std::pair<Circle, PackedRgb> > >::fwd CircleList;
-	typedef stdvector<std::pair<Transform, float/*axisLength*/> >::fwd AxisList;
-	typedef stdvector<std::pair<float/*length*/, std::pair<float/*coneAngle*/, PackedRgb> > >::fwd ConeList;
+	typedef std::vector<Transform> TransformList;
+	typedef std::vector<std::string> TextList;
+	typedef std::vector<std::pair<CachedNetworkId, std::pair<Vector, PackedRgb> > > LineList;
+	typedef std::vector<std::pair<TransformList, bool/*cyclic*/> > PathList;
+	typedef std::vector<std::pair<CachedNetworkId, std::pair<Circle, PackedRgb> > > CircleList;
+	typedef std::vector<std::pair<Transform, float/*axisLength*/> > AxisList;
+	typedef std::vector<std::pair<float/*length*/, std::pair<float/*coneAngle*/, PackedRgb> > > ConeList;
 
 	// Use to custom embed multiple colors in text
 

engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h

@@ -68,7 +68,7 @@ public:
 	class CollectionInfoCollection
 	{
 		public:
-			CollectionInfoCollection(std::string const & cName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, stdvector<std::string>::fwd const & pCategories, std::vector<std::string> const & pTitles, bool pNoReward, bool pTrackServerFirst, CollectionInfoPage const & pPage) :
+			CollectionInfoCollection(std::string const & cName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, std::vector<std::string> const & pCategories, std::vector<std::string> const & pTitles, bool pNoReward, bool pTrackServerFirst, CollectionInfoPage const & pPage) :
 				name(cName), icon(pIcon), showIfNotYetEarned(pShowIfNotYetEarned), hidden(pHidden), categories(pCategories), titles(pTitles), noReward(pNoReward), trackServerFirst(pTrackServerFirst), serverFirstClaimTime(0), serverFirstClaimantId(), serverFirstClaimantName(), page(pPage) {};
 
 			std::string const name;
@@ -96,7 +96,7 @@ public:
 		friend class CollectionsDataTable;
 
 		public:
-			CollectionInfoSlot(std::string const & pName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, bool pNotifyScriptOnModify, int pSlotIdIndex, int pBeginSlotId, int pAbsoluteBeginSlotId, int pEndSlotId, int pAbsoluteEndSlotId, unsigned long pMaxSlotValue, unsigned long pMaxValueForNumBits, stdvector<std::string>::fwd const & pCategories, stdvector<std::string>::fwd const & pPrereqs, std::string const & pMusic, std::vector<std::string> const & pTitles, CollectionInfoCollection const & pCollection) :
+			CollectionInfoSlot(std::string const & pName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, bool pNotifyScriptOnModify, int pSlotIdIndex, int pBeginSlotId, int pAbsoluteBeginSlotId, int pEndSlotId, int pAbsoluteEndSlotId, unsigned long pMaxSlotValue, unsigned long pMaxValueForNumBits, std::vector<std::string> const & pCategories, std::vector<std::string> const & pPrereqs, std::string const & pMusic, std::vector<std::string> const & pTitles, CollectionInfoCollection const & pCollection) :
 				name(pName), icon(pIcon), showIfNotYetEarned(pShowIfNotYetEarned), hidden(pHidden), notifyScriptOnModify(pNotifyScriptOnModify), slotIdIndex(pSlotIdIndex), beginSlotId(pBeginSlotId), absoluteBeginSlotId(pAbsoluteBeginSlotId), endSlotId(pEndSlotId), absoluteEndSlotId(pAbsoluteEndSlotId), counterTypeSlot(pEndSlotId > 0), maxSlotValue(pMaxSlotValue), maxValueForNumBits(pMaxValueForNumBits), categories(pCategories), prereqsPtr(), music(pMusic), titles(pTitles), collection(pCollection), prereqs(pPrereqs) {};
 
 			std::string const name;
@@ -141,36 +141,36 @@ public:
 	static CollectionsDataTable::CollectionInfoSlot const * isASlotTitle(std::string const & titleName);
 
 	// collections
-	static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCollection(std::string const & collectionName);
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCollection(std::string const & collectionName);
 	static std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & getAllTitleableCollections();
 	static CollectionsDataTable::CollectionInfoCollection const * isACollectionTitle(std::string const & titleName);
-	static stdmap<std::string, CollectionsDataTable::CollectionInfoCollection const *>::fwd const & getAllServerFirstCollections();
+	static std::map<std::string, CollectionsDataTable::CollectionInfoCollection const *> const & getAllServerFirstCollections();
 	static CollectionsDataTable::CollectionInfoCollection const * getCollectionByName(std::string const & collectionName);
 
 	// pages
-	static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInPage(std::string const & pageName);
-	static stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd const & getCollectionsInPage(std::string const & pageName);
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInPage(std::string const & pageName);
+	static std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & getCollectionsInPage(std::string const & pageName);
 	static std::vector<CollectionsDataTable::CollectionInfoPage const *> const & getAllTitleablePages();
 	static CollectionsDataTable::CollectionInfoPage const * isAPageTitle(std::string const & titleName);
 	static CollectionsDataTable::CollectionInfoPage const * getPageByName(std::string const & pageName);
 
 	// books
-	static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInBook(std::string const & bookName);
-	static stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd const & getCollectionsInBook(std::string const & bookName);
-	static stdvector<CollectionsDataTable::CollectionInfoPage const *>::fwd const & getPagesInBook(std::string const & bookName);
-	static stdvector<CollectionsDataTable::CollectionInfoBook const *>::fwd const & getAllBooks();
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInBook(std::string const & bookName);
+	static std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & getCollectionsInBook(std::string const & bookName);
+	static std::vector<CollectionsDataTable::CollectionInfoPage const *> const & getPagesInBook(std::string const & bookName);
+	static std::vector<CollectionsDataTable::CollectionInfoBook const *> const & getAllBooks();
 	static CollectionsDataTable::CollectionInfoBook const * getBookByName(std::string const & bookName);
 
 	// categories
-	static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategory(std::string const & categoryName);
-	static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategoryByCollection(std::string const & collectionName, std::string const & categoryName);
-	static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategoryByPage(std::string const & pageName, std::string const & categoryName);
-	static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategoryByBook(std::string const & bookName, std::string const & categoryName);
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategory(std::string const & categoryName);
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategoryByCollection(std::string const & collectionName, std::string const & categoryName);
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategoryByPage(std::string const & pageName, std::string const & categoryName);
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategoryByBook(std::string const & bookName, std::string const & categoryName);
 
-	static stdset<std::string>::fwd const & getAllSlotCategoriesInCollection(std::string const & collectionName);
-	static stdset<std::string>::fwd const & getAllSlotCategoriesInPage(std::string const & pageName);
-	static stdset<std::string>::fwd const & getAllSlotCategoriesInBook(std::string const & bookName);
-	static stdset<std::string>::fwd const & getAllSlotCategories();
+	static std::set<std::string> const & getAllSlotCategoriesInCollection(std::string const & collectionName);
+	static std::set<std::string> const & getAllSlotCategoriesInPage(std::string const & pageName);
+	static std::set<std::string> const & getAllSlotCategoriesInBook(std::string const & bookName);
+	static std::set<std::string> const & getAllSlotCategories();
 
 	// misc
 	static Unicode::String localizeCollectionName(std::string const & name);
@@ -179,7 +179,7 @@ public:
 	static char const * getShowIfNotYetEarnedTypeString(ShowIfNotYetEarnedType const showIfNotYetEarned);
 
 	// "server first" processing
-	static void setServerFirstData(stdset<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > >::fwd const & collectionServerFirst);
+	static void setServerFirstData(std::set<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > > const & collectionServerFirst);
 
 private: // disabled
 

engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.h

@@ -49,10 +49,10 @@ public:
 		SearchAttribute &operator =(SearchAttribute const &);
 	};
 
-	static stdmap<std::string, CommoditiesAdvancedSearchAttribute::SearchAttribute const *>::fwd const & getSearchAttributeForGameObjectType(int gameObjectType);
+	static std::map<std::string, CommoditiesAdvancedSearchAttribute::SearchAttribute const *> const & getSearchAttributeForGameObjectType(int gameObjectType);
 	static CommoditiesAdvancedSearchAttribute::SearchAttribute const * getSearchAttribute(int gameObjectType, std::string const & attributeName);
 
-	static stdmap<std::string, std::string>::fwd const & getSearchAttributeNameAliasesForGameObjectType(int gameObjectType);
+	static std::map<std::string, std::string> const & getSearchAttributeNameAliasesForGameObjectType(int gameObjectType);
 
 	static bool allowChildGameObjectTypeToInheritSearchAttribute(int gameObjectType);
 

engine/shared/library/sharedGame/src/shared/core/CraftingData.cpp

@@ -209,7 +209,7 @@ const std::string & Crafting::getResourceAttributeName (int attr)
 
 const StringId & Crafting::getResourceAttributeNameStringId (int attr)
 {
-	typedef stdmap<int, StringId>::fwd ResourceAttributeNameStringIds;
+	typedef std::map<int, StringId> ResourceAttributeNameStringIds;
 	static ResourceAttributeNameStringIds sids;
 
 	const ResourceAttributeNameStringIds::iterator it = sids.find (attr);

engine/shared/library/sharedGame/src/shared/core/CraftingData.h

@@ -147,7 +147,7 @@ namespace Crafting
 		CraftingType_Last = CT_mission,
 	};
 
-	typedef stdvector<std::string>::fwd StringVector;
+	typedef std::vector<std::string> StringVector;
 	void getCraftingTypeNames (uint32 types, StringVector & sv);
 
 	//------------------------------------------------------------------------------
@@ -229,8 +229,8 @@ namespace Crafting
 
 		IngredientSlot(enum IngredientType _ingredientType,
 		               const StringId & _name,
-					   const stdvector<NetworkId>::fwd &slotIngredients,
-					   const stdvector<int>::fwd &slotIngredientsCount,
+					   const std::vector<NetworkId> &slotIngredients,
+					   const std::vector<int> &slotIngredientsCount,
 		               float _complexity,
 		               int _draftSlotOption,
 		               int _draftSlotIndex);

engine/shared/library/sharedGame/src/shared/core/CustomizationManager.h

@@ -93,8 +93,8 @@ public:
 	static std::string const cms_shared_owner_no_slash;
 	static std::string const cms_priv;
 
-	typedef stdvector<Customization>::fwd CustomizationVector;
-	typedef stdmap<std::string, CustomizationVector>::fwd CustomizationSpeciesMap;
+	typedef std::vector<Customization> CustomizationVector;
+	typedef std::map<std::string, CustomizationVector> CustomizationSpeciesMap;
 
 	static void install();
 	static void remove();
@@ -113,7 +113,7 @@ public:
 	static std::string convertServerHairTemplateNameToSharedHairTemplateName(std::string const &serverHairTemplateName);
 	static PaletteColumns getPaletteColumnDataShortName(std::string const & paletteName);
 	static PaletteColumns getPaletteColumnDataLongName(std::string const & paletteName);
-	static stdmap<std::string, PaletteColumns>::fwd const & getPaletteColumnData();
+	static std::map<std::string, PaletteColumns> const & getPaletteColumnData();
 	static bool isHoloemoteName(std::string const & holoemoteName);
 	static int const getRequiredHairSkillForHoloemote(std::string const & holoemoteName);
 

engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp

@@ -26,7 +26,7 @@ namespace DraftSchematicGroupManagerNamespace
 {
 	typedef DraftSchematicGroupManager::StringVector      StringVector;
 	typedef DraftSchematicGroupManager::SchematicVector   SchematicVector;
-	typedef stdmap<std::string, SchematicVector>::fwd     GroupMapping;
+	typedef std::map<std::string, SchematicVector>     GroupMapping;
 
 	GroupMapping       s_groupMapping;
 	bool               s_installed = false;

engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.h

@@ -14,8 +14,8 @@ class DraftSchematicGroupManager
 {
 public:
 
-	typedef stdvector<std::string>::fwd                StringVector;
-	typedef stdvector<std::pair<uint32, uint32> >::fwd SchematicVector;
+	typedef std::vector<std::string>                StringVector;
+	typedef std::vector<std::pair<uint32, uint32> > SchematicVector;
 
 	static void                         getGroups             (StringVector & sv);
 	static bool                         getSchematicsForGroup (const std::string & group, SchematicVector & sv);

engine/shared/library/sharedGame/src/shared/core/FormManager.h

@@ -20,7 +20,7 @@ class FormManager
 {
 public:
 	typedef Unicode::String PackedFormData;
-	typedef stdmap<std::string, stdvector<std::string>::fwd >::fwd UnpackedFormData;
+	typedef std::map<std::string, std::vector<std::string> > UnpackedFormData;
 
 	//the various types of fields that the form can support
 	enum FieldType
@@ -65,17 +65,17 @@ public:
 			bool isFloatType() const;
 			bool isStringType() const;
 			bool isArrayType() const;
-			bool isValidValue(std::string const & value, stdmap<std::string, std::string>::fwd const & pendingData, std::string & errorString /*OUT*/) const;
-			bool isValidValue(int value, stdmap<std::string, std::string>::fwd const & pendingData, std::string & errorString /*OUT*/) const;
-			bool isValidValue(float value, stdmap<std::string, std::string>::fwd const & pendingData, std::string & errorString /*OUT*/) const;
-			int getMinimumIntValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
-			int getMaximumIntValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
-			float getMinimumFloatValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
-			float getMaximumFloatValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
+			bool isValidValue(std::string const & value, std::map<std::string, std::string> const & pendingData, std::string & errorString /*OUT*/) const;
+			bool isValidValue(int value, std::map<std::string, std::string> const & pendingData, std::string & errorString /*OUT*/) const;
+			bool isValidValue(float value, std::map<std::string, std::string> const & pendingData, std::string & errorString /*OUT*/) const;
+			int getMinimumIntValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
+			int getMaximumIntValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
+			float getMinimumFloatValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
+			float getMaximumFloatValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
 
 			std::string const & getName() const;
 			std::string const & getExternalName() const;
-			stdvector<OtherValidationRules>::fwd const & getOtherValidationRules() const;
+			std::vector<OtherValidationRules> const & getOtherValidationRules() const;
 			std::string const & getDefaultValue() const;
 			std::string const & getObjvarBinding() const;
 
@@ -93,11 +93,11 @@ public:
 			std::string m_maximumValue;
 			bool m_minimumValueSet;
 			bool m_maximumValueSet;
-			stdvector<std::string>::fwd * m_choices;
+			std::vector<std::string> * m_choices;
 			bool        m_mustUseList;
 			std::string m_validationFilename;
 			int         m_validationFilenameColumn;
-			stdvector<OtherValidationRules>::fwd * m_otherValidationRules;
+			std::vector<OtherValidationRules> * m_otherValidationRules;
 			Form const * m_parentForm;
 			std::string m_objvarBinding;
 	};
@@ -113,7 +113,7 @@ public:
 			bool isNameOfField(std::string const & fieldName) const;
 			Field const * getField(std::string const & fieldName) const;
 			std::string const & getName() const;
-			stdvector<Field const *>::fwd const & getOrderedFieldList() const;
+			std::vector<Field const *> const & getOrderedFieldList() const;
 
 			Form();
 			virtual ~Form();
@@ -124,8 +124,8 @@ public:
 
 		private:
 			std::string m_name;
-			stdmap<std::string, Field *>::fwd* m_fields;
-			stdvector<Field const *>::fwd* m_orderedFieldList;
+			std::map<std::string, Field *>* m_fields;
+			std::vector<Field const *>* m_orderedFieldList;
 	};
 
 //This is an "abstract" static manager, which is instanciated by clientGame/FormManagerClient and serverGame/FormManagerServer
@@ -155,13 +155,13 @@ private:
 
 private:
 	//this map OWNS the Form pointers
-	static stdmap<std::string, Form *>::fwd * ms_forms;
+	static std::map<std::string, Form *> * ms_forms;
 	//this map hold pointers to Forms, but does NOT own them
-	static stdmap<std::string, Form const *>::fwd * ms_serverObjectTemplateToForms;
+	static std::map<std::string, Form const *> * ms_serverObjectTemplateToForms;
 	//this map hold pointers to Forms, but does NOT own them
-	static stdmap<std::string, Form const *>::fwd * ms_sharedObjectTemplateToForms;
+	static std::map<std::string, Form const *> * ms_sharedObjectTemplateToForms;
 	//this map stores whether a particular server template was mapped for an "auto-object-creating" form in formmap.tab
-	static stdmap<std::string, bool>::fwd * ms_automaticallyCreateObjectForServerObjectTemplate;
+	static std::map<std::string, bool> * ms_automaticallyCreateObjectForServerObjectTemplate;
 };
 
 //======================================================================

engine/shared/library/sharedGame/src/shared/core/GameLanguageManager.h

@@ -15,7 +15,7 @@ class GameLanguageManager
 {
 public:
 
-	typedef stdvector<std::string>::fwd StringVector;
+	typedef std::vector<std::string> StringVector;
 
 	static void install();
 

engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.cpp

@@ -473,8 +473,8 @@ bool GameObjectTypes::isSubType        (int type)
 bool GameObjectTypes::doesPowerupApply (int powerupType, int targetType)
 {
 	//@todo: this should be data driven
-	typedef stdvector<int>::fwd IntVector;
-	typedef stdmap<int, IntVector>::fwd IntVectorMap;
+	typedef std::vector<int> IntVector;
+	typedef std::map<int, IntVector> IntVectorMap;
 	static IntVectorMap s_powerupGotMap;
 	static bool s_powerupGotMapInstalled = false;
 	if (!s_powerupGotMapInstalled)

engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.h

@@ -18,10 +18,10 @@ class GameObjectTypes
 {
 public:
 
-	typedef stdmap<int, StringId>::fwd        TypeStringIdMap;
-	typedef stdmap<int, std::string>::fwd     TypeStringMap;
-	typedef stdmap<std::string, int>::fwd     StringTypeMap;
-	typedef stdmap<int, Unicode::String>::fwd TypeUnicodeStringMap;
+	typedef std::map<int, StringId>        TypeStringIdMap;
+	typedef std::map<int, std::string>     TypeStringMap;
+	typedef std::map<std::string, int>     StringTypeMap;
+	typedef std::map<int, Unicode::String> TypeUnicodeStringMap;
 
 	static const TypeStringMap &   getTypeStringMap ();
 
@@ -41,7 +41,7 @@ public:
 	static bool                    doesPowerupApply (int powerupType, int targetType);
 
 	static bool                    isExcludedFromCommodities(int type);
-	static stdmap<int, std::string>::fwd const & getTypesExcludedFromCommodities();
+	static std::map<int, std::string> const & getTypesExcludedFromCommodities();
 
 	static const int ms_type_mask;
 };

engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.h

@@ -33,7 +33,7 @@ public:
 	static Vector getDirectionToHyperspacePoint_w(std::string const & fromSceneName, Vector const & fromLocation_w, std::string const & toSceneName, Vector const & toLocation_w);
 	static bool isValidHyperspacePoint(std::string const & hyperspacePointName);
 	static bool getHyperspacePoint(std::string const & hyperspacePointName, HyperspaceLocation & /*OUT*/ location);
-	static bool getHyperspacePoints(std::string const & sceneName, stdvector<HyperspaceLocation>::fwd & /*OUT*/ locations);
+	static bool getHyperspacePoints(std::string const & sceneName, std::vector<HyperspaceLocation> & /*OUT*/ locations);
 
 	static std::string getHomeLocationHyperspacePointName();
 	static bool isValidSceneForHomeLocationHyperspace(std::string const & sceneName);

engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h

@@ -53,7 +53,7 @@ public:
 	static LfgCharacterData::Profession convertSkillTemplateToProfession(const std::string & skillTemplate);
 	static std::string getProfessionDebugString(LfgCharacterData::Profession profession);
 	static Unicode::String const & getProfessionDisplayString(LfgCharacterData::Profession profession);
-	static stdmap<std::string, int>::fwd const & calculateStatistics(stdmap<NetworkId, LfgCharacterData>::fwd const & connectedCharacterLfgData);
+	static std::map<std::string, int> const & calculateStatistics(std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData);
 
 	std::string getDebugString() const;
 

engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h

@@ -86,7 +86,7 @@ public:
 	};
 
 	static std::vector<LfgNode const *> const & getTopLevelLfgNodes();
-	static stdmap<std::string, LfgDataTable::LfgNode const *>::fwd const & getAllLfgLeafNodes();
+	static std::map<std::string, LfgDataTable::LfgNode const *> const & getAllLfgLeafNodes();
 	static LfgNode const * getLfgNodeByName(std::string const & lfgNodeName);
 	static LfgNode const * getLfgLeafNodeByName(std::string const & lfgNodeName);
 	

engine/shared/library/sharedGame/src/shared/core/MoodManager.cpp

@@ -20,8 +20,8 @@
 
 namespace
 {
-	typedef stdmap<uint32,std::string>::fwd IntStringMap;
-	typedef stdmap<std::string,uint32>::fwd StringIntMap;
+	typedef std::map<uint32,std::string> IntStringMap;
+	typedef std::map<std::string,uint32> StringIntMap;
 	
 	IntStringMap s_idToNameMap;
 	StringIntMap s_nameToIdMap;

engine/shared/library/sharedGame/src/shared/core/MoodManager.h

@@ -18,7 +18,7 @@ class MoodManager
 {
 public:
 
-	typedef stdmap<std::string, uint32>::fwd StringIntMap;
+	typedef std::map<std::string, uint32> StringIntMap;
 
 	static void                          install ();
 	static void                          remove ();

engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.h

@@ -25,8 +25,8 @@ class OutOfBandPackager
 {
 public:
 
-	typedef stdvector<OutOfBandBase *>::fwd OutOfBandBaseVector;
-	typedef stdvector<std::pair<std::string, Unicode::String> >::fwd AttributeVector;
+	typedef std::vector<OutOfBandBase *> OutOfBandBaseVector;
+	typedef std::vector<std::pair<std::string, Unicode::String> > AttributeVector;
 
 	enum OobTypes
 	{

engine/shared/library/sharedGame/src/shared/core/PlanetMapManager.cpp

@@ -21,12 +21,12 @@
 
 namespace PlanetMapManagerNamespace
 {
-	typedef stdmap<uint8,       std::string>::fwd     TypeNameMap;
-	typedef stdmap<std::string, uint8>::fwd           NameTypeMap;
-	typedef stdmap<uint8,       StringId>::fwd TypeStringIdMap;
+	typedef std::map<uint8,       std::string>     TypeNameMap;
+	typedef std::map<std::string, uint8>           NameTypeMap;
+	typedef std::map<uint8,       StringId> TypeStringIdMap;
 
 	typedef std::pair<uint32, bool> FactionAndVisibility;
-	typedef stdmap<uint8,       FactionAndVisibility>::fwd          TypeFactionMap;
+	typedef std::map<uint8,       FactionAndVisibility>          TypeFactionMap;
 
 	TypeNameMap    s_typeNameMap;
 	NameTypeMap    s_nameTypeMap;

engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp

@@ -600,7 +600,7 @@ bool PlayerCreationManager::getRacialTotal(const std::string & sharedTemplateNam
 
 //----------------------------------------------------------------------
 
-bool PlayerCreationManager::test (std::string & result, const stdvector<std::string>::fwd & templateNames)
+bool PlayerCreationManager::test (std::string & result, const std::vector<std::string> & templateNames)
 {
 	DEBUG_FATAL (!s_installed, ("not installed.\n"));
 	UNREF (result);

engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.h

@@ -26,22 +26,22 @@ public:
 		EqInfo (int32 i, const std::string & a, const std::string & b);
 	};
 
-	typedef stdvector<std::string>::fwd            SkillVector;
-	typedef stdvector<EqInfo>::fwd                 EqVector;
-	typedef stdvector<std::string>::fwd            StringVector;
-	typedef stdvector<int>::fwd                    AttribVector;
-	typedef stdmap<std::string, AttribVector>::fwd ProfessionAttribMap;
+	typedef std::vector<std::string>            SkillVector;
+	typedef std::vector<EqInfo>                 EqVector;
+	typedef std::vector<std::string>            StringVector;
+	typedef std::vector<int>                    AttribVector;
+	typedef std::map<std::string, AttribVector> ProfessionAttribMap;
 
 	static void                   clear ();
 	static void                   init  ();
 	
-	static bool                   test (std::string & result, const stdvector<std::string>::fwd & templateNames);
+	static bool                   test (std::string & result, const std::vector<std::string> & templateNames);
 
 	static void                   getProfessionVector (StringVector & sv, const std::string & categoryName);
 
-	static bool                   getRacialModifiers     (const std::string& sharedTemplateName, stdvector<int>::fwd & /*OUT*/ modifiers);
-	static bool                   getProfessionModifiers (const std::string& profession, stdvector<int>::fwd & /*OUT*/modifiers);
-	static bool                   getRacialMinMaxes      (const std::string& sharedTemplateName, stdvector<std::pair<int, int> >::fwd & /*OUT*/ minMaxes);
+	static bool                   getRacialModifiers     (const std::string& sharedTemplateName, std::vector<int> & /*OUT*/ modifiers);
+	static bool                   getProfessionModifiers (const std::string& profession, std::vector<int> & /*OUT*/modifiers);
+	static bool                   getRacialMinMaxes      (const std::string& sharedTemplateName, std::vector<std::pair<int, int> > & /*OUT*/ minMaxes);
 	static bool                   getRacialTotal         (const std::string& sharedTemplateName, int & /*OUT*/ total);
 
 protected:
@@ -60,10 +60,10 @@ private:
 	static void                   buildRacialMinsMaxes   ();
 
 private:
-	static stdmap<std::string, stdvector<int>::fwd >::fwd                  m_racialModifiers;
-	static stdmap<std::string, stdvector<int>::fwd >::fwd                  m_professionModifiers;
-	static stdmap<std::string, stdvector<std::pair<int, int> >::fwd >::fwd m_racialMinMaxes;
-	static stdmap<std::string, int>::fwd                                   m_racialTotals;
+	static std::map<std::string, std::vector<int> >                  m_racialModifiers;
+	static std::map<std::string, std::vector<int> >                  m_professionModifiers;
+	static std::map<std::string, std::vector<std::pair<int, int> > > m_racialMinMaxes;
+	static std::map<std::string, int>                                   m_racialTotals;
 };
 
 //======================================================================

engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp

@@ -26,10 +26,10 @@ namespace
 		bool        useRadialTarget;
 	};
 
-	typedef stdmap<int, RadialMenuInfo>::fwd RangeMap;
+	typedef std::map<int, RadialMenuInfo> RangeMap;
 	RangeMap s_ranges;
 	
-	typedef stdmap<std::string, int>::fwd NameMap;
+	typedef std::map<std::string, int> NameMap;
 	NameMap  s_names;
 
 	bool s_installed = false;

engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.h

@@ -18,7 +18,7 @@ class RadialMenuManager
 {
 public:
 
-	typedef stdvector<ObjectMenuRequestData>::fwd DataVector;
+	typedef std::vector<ObjectMenuRequestData> DataVector;
 
 	static int         getMenuTypeByName     (const std::string & name);
 	static bool        getRangeForMenuType   (int menuType, float &range);

engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h

@@ -58,7 +58,7 @@ public:
 		std::string m_requiredExpertise;
 	};
 
-	typedef stdmap<std::string, BuffBuilderDataTypeRecord>::fwd BuffBuilderDataType;
+	typedef std::map<std::string, BuffBuilderDataTypeRecord> BuffBuilderDataType;
 	static BuffBuilderDataType* ms_buffBuilderData;
 
 public:

engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.h

@@ -100,7 +100,7 @@ class SharedBuildoutAreaManager
 {
 public:
 
-	typedef stdvector<BuildoutArea>::fwd BuildoutAreaVector;
+	typedef std::vector<BuildoutArea> BuildoutAreaVector;
 	typedef std::pair<std::string, std::string> StringPair;
 
 	static bool isBuildoutScene(std::string const & sceneName);

engine/shared/library/sharedGame/src/shared/core/SocialsManager.cpp

@@ -21,8 +21,8 @@
 
 namespace
 {
-	typedef stdmap<uint32,std::string>::fwd IntStringMap;
-	typedef stdmap<std::string,uint32>::fwd StringIntMap;
+	typedef std::map<uint32,std::string> IntStringMap;
+	typedef std::map<std::string,uint32> StringIntMap;
 
 	IntStringMap s_idToNameMap;
 	StringIntMap s_nameToIdMap;

engine/shared/library/sharedGame/src/shared/core/SocialsManager.h

@@ -14,7 +14,7 @@ class SocialsManager
 {
 public:
 
-	typedef stdmap<std::string, uint32>::fwd StringIntMap;
+	typedef std::map<std::string, uint32> StringIntMap;
 
 	static void                         install ();
 	static void                         remove  ();

engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.cpp

@@ -21,11 +21,11 @@
 
 namespace SpatialChatManagerNamespace
 {
-	typedef stdmap<uint32,std::string>::fwd IntStringMap;
-	typedef stdmap<std::string,uint32>::fwd StringIntMap;
-	typedef stdmap<uint32,uint16>::fwd      IntShortMap;
-	typedef stdset<uint32>::fwd             IntSet;
-	typedef stdmap<uint32,std::vector<std::string> >::fwd IntStringVectorMap;
+	typedef std::map<uint32,std::string> IntStringMap;
+	typedef std::map<std::string,uint32> StringIntMap;
+	typedef std::map<uint32,uint16>      IntShortMap;
+	typedef std::set<uint32>             IntSet;
+	typedef std::map<uint32,std::vector<std::string> > IntStringVectorMap;
 
 	IntStringMap s_idToNameMap;
 	StringIntMap s_nameToIdMap;
@@ -150,7 +150,7 @@ uint16 SpatialChatManager::getVolume           (uint32 type)
 
 //----------------------------------------------------------------------
 
-const stdvector<std::string>::fwd &SpatialChatManager::getSkillsProviding(uint32 type)
+const std::vector<std::string> &SpatialChatManager::getSkillsProviding(uint32 type)
 {
 	const IntStringVectorMap::const_iterator it = s_skillsProviding.find(type);
 	if (it != s_skillsProviding.end())

engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.h

@@ -19,7 +19,7 @@ public:
 	static uint32                        getChatTypeByName   (const std::string & name);
 	static uint32                        getDefaultChatType  ();
 	static bool                          getChatNameByType   (uint32 type, std::string & name);
-	static const stdvector<std::string>::fwd & getSkillsProviding  (uint32 type);
+	static const std::vector<std::string> & getSkillsProviding  (uint32 type);
 
 	static bool                          isPrivate           (uint32 type);
 	static uint16                        getVolume           (uint32 type);

engine/shared/library/sharedGame/src/shared/core/Universe.h

@@ -28,7 +28,7 @@ class Universe
 	ResourceClassObject *         getResourceClassByName      (const std::string &name) const;
 	ResourceClassObject *         getResourceClassByNameCrc   (uint32 nameCrc) const;
 	void                          registerResourceClassObject (ResourceClassObject &newClass);
-	virtual void                  resourceClassTreeLoaded     (stdmap<int, ResourceClassObject*>::fwd &resourceClasses) = 0;
+	virtual void                  resourceClassTreeLoaded     (std::map<int, ResourceClassObject*> &resourceClasses) = 0;
 	virtual ResourceClassObject * makeResourceClassObject     () = 0;
 
 	bool                          derivesFromResource         (const std::string & base, const std::string & leaf) const;
@@ -37,8 +37,8 @@ class Universe
 	//
 	// Resource Class Objects
 	//
-	typedef stdmap<std::string, ResourceClassObject*>::fwd    ResourceClassNameMap;
-	typedef stdmap<uint32, ResourceClassObject*>::fwd         ResourceClassNameCrcMap;
+	typedef std::map<std::string, ResourceClassObject*>    ResourceClassNameMap;
+	typedef std::map<uint32, ResourceClassObject*>         ResourceClassNameCrcMap;
 	ResourceClassNameMap *                                    m_resourceClassNameMap;
 	ResourceClassNameCrcMap *                                 m_resourceClassNameCrcMap;
 	ResourceClassObject *                                     m_resourceTreeRoot;

engine/shared/library/sharedGame/src/shared/object/MatchMakingId.h

@@ -40,7 +40,7 @@ public:
 		B_anonymous = 127
 	};
 
-	typedef stdvector<int>::fwd IntVector;
+	typedef std::vector<int> IntVector;
 
 	MatchMakingId();
 

engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h

@@ -23,7 +23,7 @@ class StringId;
 class ResourceClassObject
 {
 public:
-	typedef stdmap<std::string, std::pair<int, int> >::fwd ResourceAttributeRangesType;
+	typedef std::map<std::string, std::pair<int, int> > ResourceAttributeRangesType;
 
 public:
 	ResourceClassObject();
@@ -32,7 +32,7 @@ public:
 	static void install();
 	static void remove();
 	static bool isClassExcludedFromCommodities(std::string const & className);
-	static stdset<std::string>::fwd const & getClassesExcludedFromCommodities();
+	static std::set<std::string> const & getClassesExcludedFromCommodities();
 
 public:
 	// getter functions
@@ -49,8 +49,8 @@ public:
 	void                    getCrateTemplate     (std::string &buffer) const;
 	int                     getMinTypes          () const;
 	int                     getMaxTypes          () const;
-	void                    getChildren          (stdvector<const ResourceClassObject *>::fwd & children, bool recurse) const;
-	void                    getLeafChildren      (stdvector<const ResourceClassObject *>::fwd & children) const;
+	void                    getChildren          (std::vector<const ResourceClassObject *> & children, bool recurse) const;
+	void                    getLeafChildren      (std::vector<const ResourceClassObject *> & children) const;
 	int                     getMinPools          () const;
 	int                     getMaxPools          () const;
 	bool                    isRecycled           () const;
@@ -82,7 +82,7 @@ protected:
 	ResourceAttributeRangesType * m_resourceAttributeRanges;
 	
 protected:
-	typedef stdvector<ResourceClassObject*>::fwd ClassList;
+	typedef std::vector<ResourceClassObject*> ClassList;
 	ClassList * m_children;
 	
 private:

engine/shared/library/sharedGame/src/shared/object/SlopeEffectProperty.h

@@ -46,7 +46,7 @@ private:
 
 // ======================================================================
 
-inline const stdvector<Vector>::fwd & SlopeEffectProperty::getNormals() const
+inline const std::vector<Vector> & SlopeEffectProperty::getNormals() const
 {
 	return m_normals;
 }

engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h

@@ -199,10 +199,10 @@ protected:
 private:
 	// this enum is also defined in the server object_template.tdf file
 	// this enum is also defined in the server object_template.tdf file
-	stdvector<StructParamOT *>::fwd m_slots;		// ingredient slots
+	std::vector<StructParamOT *> m_slots;		// ingredient slots
 	bool m_slotsLoaded;
 	bool m_slotsAppend;
-	stdvector<StructParamOT *>::fwd m_attributes;		// what attributes the schematic can affect
+	std::vector<StructParamOT *> m_attributes;		// what attributes the schematic can affect
 	bool m_attributesLoaded;
 	bool m_attributesAppend;
 	StringParam m_craftedSharedTemplate;

engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h

@@ -291,25 +291,25 @@ protected:
 	virtual void load(Iff &file);
 
 private:
-	stdvector<StructParamOT *>::fwd m_paletteColorCustomizationVariables;		// // all palette color customization variables exposed by an Object created with this template
+	std::vector<StructParamOT *> m_paletteColorCustomizationVariables;		// // all palette color customization variables exposed by an Object created with this template
 	bool m_paletteColorCustomizationVariablesLoaded;
 	bool m_paletteColorCustomizationVariablesAppend;
-	stdvector<StructParamOT *>::fwd m_rangedIntCustomizationVariables;		// // all ranged-int style customization variables exposed by an Object created with this template
+	std::vector<StructParamOT *> m_rangedIntCustomizationVariables;		// // all ranged-int style customization variables exposed by an Object created with this template
 	bool m_rangedIntCustomizationVariablesLoaded;
 	bool m_rangedIntCustomizationVariablesAppend;
-	stdvector<StructParamOT *>::fwd m_constStringCustomizationVariables;		// // constant string values added to the Object's customization data, not persisted in the DB
+	std::vector<StructParamOT *> m_constStringCustomizationVariables;		// // constant string values added to the Object's customization data, not persisted in the DB
 	bool m_constStringCustomizationVariablesLoaded;
 	bool m_constStringCustomizationVariablesAppend;
-	stdvector<IntegerParam *>::fwd m_socketDestinations;		// // GOTs that this object can be socketed into
+	std::vector<IntegerParam *> m_socketDestinations;		// // GOTs that this object can be socketed into
 	bool m_socketDestinationsLoaded;
 	bool m_socketDestinationsAppend;
 	StringParam m_structureFootprintFileName;
 	BoolParam m_useStructureFootprintOutline;
 	BoolParam m_targetable;		// // can the object be targetted by the client
-	stdvector<StringParam *>::fwd m_certificationsRequired;		// // List of the certifications required to use this item (used in x1 only)
+	std::vector<StringParam *> m_certificationsRequired;		// // List of the certifications required to use this item (used in x1 only)
 	bool m_certificationsRequiredLoaded;
 	bool m_certificationsRequiredAppend;
-	stdvector<StructParamOT *>::fwd m_customizationVariableMapping;		// // Allows remapping of variables when needed
+	std::vector<StructParamOT *> m_customizationVariableMapping;		// // Allows remapping of variables when needed
 	bool m_customizationVariableMappingLoaded;
 	bool m_customizationVariableMappingAppend;
 	IntegerParam m_clientVisabilityFlag;		// // can the object be viewed on the client

engine/shared/library/sharedGame/src/shared/quest/Quest.h

@@ -33,8 +33,8 @@ public:
 public:
 	bool isRepeatable() const;
 	bool isVisible() const;
-	stdvector<uint32>::fwd const & getPrerequisiteQuests() const;
-	stdvector<uint32>::fwd const & getExclusionQuests() const;
+	std::vector<uint32> const & getPrerequisiteQuests() const;
+	std::vector<uint32> const & getExclusionQuests() const;
 	int getNumberOfTasks() const;
 	QuestTask const * getTask(int taskId) const;
 	CrcString const & getName() const;
@@ -64,9 +64,9 @@ private:
 	StringId m_journalEntryTitle;
 	StringId m_journalEntryDescription;
 	StringId m_journalEntryCompetionSummary;
-	stdvector<uint32>::fwd * const m_prerequisiteQuests;
-	stdvector<uint32>::fwd * const m_exclusionQuests;
-	stdvector<QuestTask *>::fwd * const m_tasks;
+	std::vector<uint32> * const m_prerequisiteQuests;
+	std::vector<uint32> * const m_exclusionQuests;
+	std::vector<QuestTask *> * const m_tasks;
 	bool m_allowRepeats;
 	bool m_visible;
 	StringId m_category;

engine/shared/library/sharedGame/src/shared/quest/QuestTask.h

@@ -24,7 +24,7 @@ class Quest;
 class QuestTask
 {
 public:
-	typedef stdvector<int>::fwd TaskIdList;
+	typedef std::vector<int> TaskIdList;
 
 	enum QuestControl
 	{

engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp

@@ -340,7 +340,7 @@ bool AsteroidGenerationManager::hasDataForScene(std::string const & sceneName)
     The same seed data will always generate the same asteroid field.
 		The field will have randomly even distribution of position, orientation, rotation range, scale range, and template selection based on the ratios given in the fields style table
 */
-bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldData, stdvector<AsteroidData>::fwd & result)
+bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldData, std::vector<AsteroidData> & result)
 {
 	if(!s_installed)
 	{

engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.h

@@ -76,13 +76,13 @@ public:
 
 public:
 	static void install();
-	static bool generateField(AsteroidFieldData const & fieldData, stdvector<AsteroidData>::fwd & result);
-	static bool generateField(Vector const & centerPosition, float radius, int count, uint32 seed, float scaleMin, float scaleMax, float rotationMin, float rotationMax, stdvector<std::pair<uint32, float> >::fwd const & templateCrcsAndLikelihood, stdvector<AsteroidData>::fwd & asteroidDatas);
+	static bool generateField(AsteroidFieldData const & fieldData, std::vector<AsteroidData> & result);
+	static bool generateField(Vector const & centerPosition, float radius, int count, uint32 seed, float scaleMin, float scaleMax, float rotationMin, float rotationMax, std::vector<std::pair<uint32, float> > const & templateCrcsAndLikelihood, std::vector<AsteroidData> & asteroidDatas);
 	static void loadStaticFieldDataForScene(std::string const & sceneName, bool server);
 	static void clearStaticFieldData();
 	static void clearInstantiatedData();
 	static bool hasDataForScene(std::string const & sceneName);
-	static stdvector<AsteroidFieldData>::fwd const & getDataForScene(std::string const & sceneName);
+	static std::vector<AsteroidFieldData> const & getDataForScene(std::string const & sceneName);
 	static void registerGetExtentRadiusFunction(GetExtentRadiusFunction);
 
 private:
@@ -99,7 +99,7 @@ private:
 
 private:
 	typedef std::string SceneNameKey;
-	static stdmap<SceneNameKey, stdvector<AsteroidFieldData>::fwd>::fwd ms_staticFieldData;
+	static std::map<SceneNameKey, std::vector<AsteroidFieldData>> ms_staticFieldData;
 	static SphereTree<Sphere*, AsteroidDataSphereExtentAccessor> ms_collisionSphereTree;
 	static std::vector<SpatialSubdivisionHandle*> ms_objectsInSphereTree;
 	static GetExtentRadiusFunction ms_getRadiusFunction;

engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp

@@ -25,7 +25,7 @@
 namespace NebulaManagerNamespace
 {
 	typedef NebulaManager::NebulaVector NebulaVector;
-	typedef stdmap<int, Nebula const *>::fwd NebulaMap;
+	typedef std::map<int, Nebula const *> NebulaMap;
 	typedef std::map<std::string, NebulaVector> NebulasByScene;
 
 	//-- nebula vector OWNS the nebulas

engine/shared/library/sharedGame/src/shared/space/NebulaManager.h

@@ -21,7 +21,7 @@ public:
 
 	typedef void (*ImplementationClearFunction) (void);
 
-	typedef stdvector<Nebula const *>::fwd NebulaVector;
+	typedef std::vector<Nebula const *> NebulaVector;
 
 	static void install();
 	static void remove();

engine/shared/library/sharedGame/src/shared/space/PlayerFormationManager.h

@@ -19,7 +19,7 @@ class PlayerFormationManager
 {
 public:
 
-	typedef stdvector<std::string>::fwd  FormationNameList;
+	typedef std::vector<std::string>  FormationNameList;
 	struct FormationLocation;
 
 public:

engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp

@@ -28,8 +28,8 @@
 namespace ShipChassisNamespace
 {
 
-	typedef stdmap<PersistentCrcString, ShipChassis *>::fwd       NameChassisMap;
-	typedef stdmap<uint32,              ShipChassis const *>::fwd CrcChassisMap;
+	typedef std::map<PersistentCrcString, ShipChassis *>       NameChassisMap;
+	typedef std::map<uint32,              ShipChassis const *> CrcChassisMap;
 
 	typedef ShipChassis::PersistentCrcStringVector      PersistentCrcStringVector;
 	PersistentCrcStringVector * s_shipChassisNameVector;

engine/shared/library/sharedGame/src/shared/space/ShipChassis.h

@@ -21,10 +21,10 @@ class ShipChassis
 {
 public:
 
-	typedef stdvector<ShipChassisSlot>::fwd SlotVector;
-	typedef stdset<ShipChassisSlot>::fwd SlotSet;
-	typedef stdvector<int>::fwd IntVector;
-	typedef stdvector<std::string>::fwd StringVector;
+	typedef std::vector<ShipChassisSlot> SlotVector;
+	typedef std::set<ShipChassisSlot> SlotSet;
+	typedef std::vector<int> IntVector;
+	typedef std::vector<std::string> StringVector;
 
 	static void install ();
 	static void remove  ();
@@ -34,7 +34,7 @@ public:
 
 	static void setUseWritableChassis(bool onlyUseThisForTools);
 
-	typedef stdvector<PersistentCrcString *>::fwd PersistentCrcStringVector;
+	typedef std::vector<PersistentCrcString *> PersistentCrcStringVector;
 
 	static PersistentCrcStringVector const &   getShipChassisCrcVector         ();
 

engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp

@@ -31,7 +31,7 @@ namespace ShipChassisSlotNamespace
 
 	//----------------------------------------------------------------------
 
-	typedef stdvector<CrcString *>::fwd CompatibilityVector;
+	typedef std::vector<CrcString *> CompatibilityVector;
 
 	//----------------------------------------------------------------------
 

engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h

@@ -20,7 +20,7 @@ class ShipComponentDescriptor;
 class ShipChassisSlot
 {
 public:
-	typedef stdvector<CrcString *>::fwd CompatibilityVector;
+	typedef std::vector<CrcString *> CompatibilityVector;
 
 	ShipChassisSlot (ShipChassisSlotType::Type slotType, std::string const & compatibilities, int hitWeight, bool targetable);
 	ShipChassisSlot ();

engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp

@@ -273,7 +273,7 @@ namespace ShipChassisSlotTypeNamespace
 		static_cast<int>(ShipComponentType::SCT_weapon),           // SCST_weapon_99
 	};
 
-	typedef stdunordered_map<std::string, ShipChassisSlotType::Type>::fwd SlotNameTypeMap;
+	typedef std::unordered_map<std::string, ShipChassisSlotType::Type> SlotNameTypeMap;
 	SlotNameTypeMap s_slotNameTypeMap;
 
 	bool s_installed = false;

engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp

@@ -79,7 +79,7 @@ namespace ShipComponentAttachmentManagerNamespace
 		}
 	};
 
-	typedef stdmap<AttachmentKey, TemplateHardpointPairVector>::fwd AttachmentMap;
+	typedef std::map<AttachmentKey, TemplateHardpointPairVector> AttachmentMap;
 	AttachmentMap * s_attachmentMap;
 
 	typedef std::map<AttachmentKey, float> ComponentHitRangeMap;

engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.h

@@ -34,8 +34,8 @@ public:
 	static bool saveChassisInfo(std::string const & chassisName, std::string const & chassisFilenameTab, std::string const & chassisFilenameIff);
 
 	typedef std::pair<uint32, PersistentCrcString>  TemplateHardpointPair;
-	typedef stdvector<TemplateHardpointPair>::fwd   TemplateHardpointPairVector;
-	typedef stdvector<PersistentCrcString>::fwd     HardpointVector;
+	typedef std::vector<TemplateHardpointPair>   TemplateHardpointPairVector;
+	typedef std::vector<PersistentCrcString>     HardpointVector;
 
 	static TemplateHardpointPairVector const & getAttachmentsForShip          (uint32 chassisCrc, uint32 componentCrc, int chassisSlotType);
 	static bool getAttachmentsForShip(uint32 chassisCrc, uint32 componentCrc, TemplateHardpointPairVector const ** thpVectors);

engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h

@@ -25,7 +25,7 @@ class ShipComponentData
 public:
 
 	typedef std::pair<std::string, Unicode::String> AttributePair;
-	typedef stdvector<AttributePair>::fwd           AttributeVector;
+	typedef std::vector<AttributePair>           AttributeVector;
 
 	explicit ShipComponentData (ShipComponentDescriptor const & shipComponentDescriptor);
 	virtual ~ShipComponentData () = 0;

engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp

@@ -29,9 +29,9 @@
 
 namespace ShipComponentDescriptorNamespace
 {
-	typedef stdmap<PersistentCrcString, ShipComponentDescriptor *>::fwd NameComponentMap;
-	typedef stdmap<uint32, ShipComponentDescriptor const *>::fwd        CrcComponentMap;
-	typedef stdmap<uint32, ShipComponentDescriptor const *>::fwd        ObjectTemplateCrcComponentMap;
+	typedef std::map<PersistentCrcString, ShipComponentDescriptor *> NameComponentMap;
+	typedef std::map<uint32, ShipComponentDescriptor const *>        CrcComponentMap;
+	typedef std::map<uint32, ShipComponentDescriptor const *>        ObjectTemplateCrcComponentMap;
 
 	//-- the s_nameComponentMap owns the ShipComponentDescriptor objects
 	NameComponentMap *            s_nameComponentMap;

engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h

@@ -21,8 +21,8 @@ class ShipComponentDescriptor
 {
 public:
 	
-	typedef stdvector<std::string>::fwd StringVector;
-	typedef stdmap<PersistentCrcString, ShipComponentDescriptor *>::fwd NameComponentMap;
+	typedef std::vector<std::string> StringVector;
+	typedef std::map<PersistentCrcString, ShipComponentDescriptor *> NameComponentMap;
 
 	static void install ();
 	static void fetchSharedObjectTemplates();

engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp

@@ -48,7 +48,7 @@ namespace ShipComponentTypeNamespace
 		"mod_"
 	};
 
-	typedef stdunordered_map<std::string, ShipComponentType::Type>::fwd ComponentNameTypeMap;
+	typedef std::unordered_map<std::string, ShipComponentType::Type> ComponentNameTypeMap;
 	ComponentNameTypeMap s_componentNameTypeMap;
 
 	bool s_installed = false;

engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp

@@ -55,7 +55,7 @@ namespace ShipComponentWeaponManagerNamespace
 		}
 	};
 
-	typedef stdmap<uint32, Data>::fwd CrcIntMap;
+	typedef std::map<uint32, Data> CrcIntMap;
 	CrcIntMap s_dataMap;
 
 	bool s_installed = false;

engine/shared/library/sharedGame/src/shared/space/ShipTargeting.h

@@ -19,7 +19,7 @@ class ShipTargeting
 {
 public:
 
-	typedef stdvector<Object *>::fwd ObjectVector;
+	typedef std::vector<Object *> ObjectVector;
 
 	typedef bool (*ActorAndTargetHaveReletionship)(Object const * actor, Object const * target);