[ZH] Fix dependent name errors for Zero Hour build (#426)

xezon · xezon · commit bbf0939d7ab9 · 2025-03-23T21:34:24.000+01:00
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h
@@ -131,7 +131,7 @@ class SparseMatchFinder
 		AsciiString curBestMatchStr, dupMatchStr;
 	#endif
 
-		for (std::vector<MATCHABLE>::const_iterator it = v.begin(); it != v.end(); ++it)
+		for (typename std::vector<MATCHABLE>::const_iterator it = v.begin(); it != v.end(); ++it)
 		{
 			for (Int i = it->getConditionsYesCount()-1; i >= 0; --i)
 			{
@@ -197,7 +197,7 @@ class SparseMatchFinder
 	//-------------------------------------------------------------------------------------------------
 	const MATCHABLE* findBestInfo(const std::vector<MATCHABLE>& v, const BITSET& bits) const
 	{
-		MatchMap::const_iterator it = m_bestMatches.find(bits);
+		typename MatchMap::const_iterator it = m_bestMatches.find(bits);
 
 		const MATCHABLE *first = NULL;
 		if (it != m_bestMatches.end())
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
@@ -279,7 +279,7 @@ class ModuleInfo
 	ModuleInfo() { }
 
 	void addModuleInfo( ThingTemplate *thingTemplate, const AsciiString& name, const AsciiString& moduleTag, const ModuleData* data, Int interfaceMask, Bool inheritable, Bool overrideableByLikeKind = FALSE );
-	const ModuleInfo::Nugget *ModuleInfo::getNuggetWithTag( const AsciiString& tag ) const;
+	const ModuleInfo::Nugget *getNuggetWithTag( const AsciiString& tag ) const;
 
 	Int getCount() const 
 	{ 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
@@ -116,7 +116,7 @@ enum FilterModes
 class PickAndPlayInfo
 {
 public:
-	PickAndPlayInfo::PickAndPlayInfo(); //INITIALIZE THE CONSTRUCTOR IN CPP
+	PickAndPlayInfo(); //INITIALIZE THE CONSTRUCTOR IN CPP
 
 	Bool						m_air;					//Are we attacking an airborned target?
 	Drawable				*m_drawTarget;	//Do we have an override draw target?
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
@@ -110,7 +110,7 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	void recordOriginalPosition( const Coord3D &pos ) { m_originalPos.set( &pos ); }
 	const Coord3D* getOriginalPosition() const { return &m_originalPos; }
 	
-	Int ChinookAIUpdate::getUpgradedSupplyBoost() const;
+	Int getUpgradedSupplyBoost() const;
 
 protected:
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h
@@ -50,7 +50,7 @@ enum
 
 struct RunwayDefinition
 {
-	RunwayDefinition::RunwayDefinition()
+	RunwayDefinition()
 	{
 		m_catapultParticleSystem = NULL;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -330,8 +330,8 @@ class Object : public Thing, public Snapshot
 	SpecialPowerUpdateInterface* findSpecialPowerWithOverridableDestinationActive( SpecialPowerType type = SPECIAL_INVALID ) const;
 	SpecialPowerUpdateInterface* findSpecialPowerWithOverridableDestination( SpecialPowerType type = SPECIAL_INVALID ) const;
 
-	CountermeasuresBehaviorInterface* Object::getCountermeasuresBehaviorInterface();
-	const CountermeasuresBehaviorInterface* Object::getCountermeasuresBehaviorInterface() const;
+	CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface();
+	const CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() const;
 
 	inline ObjectStatusMaskType getStatusBits() const { return m_status; }
 	inline Bool testStatus( ObjectStatusTypes bit ) const { return m_status.test( bit ); }
@@ -467,7 +467,7 @@ class Object : public Thing, public Snapshot
 	void setCommandSetStringOverride( AsciiString newCommandSetString ) { m_commandSetStringOverride = newCommandSetString; }
 
 	/// People are faking their commandsets, and, Surprise!, they are authoritative.  Challenge everything.
-	Bool Object::canProduceUpgrade( const UpgradeTemplate *upgrade ); 
+	Bool canProduceUpgrade( const UpgradeTemplate *upgrade ); 
 
 
 	// Weapons & Damage -------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -1264,7 +1264,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 		This is an internal function that is used to implement the public 
 		getClosestObject and iterateObjects calls. 
 	*/
-	Object *PartitionManager::getClosestObjects(
+	Object *getClosestObjects(
 		const Object *obj, 
 		const Coord3D *pos, 
 		Real maxDist, 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp
@@ -91,7 +91,7 @@ namespace rts
 		T sum(std::vector<T>& vecOfValues )
 	{
 		T retVal = 0;
-		std::vector<T>::iterator it;
+		typename std::vector<T>::iterator it;
 		for (it = vecOfValues.begin(); it != vecOfValues.end(); ++it) {
 			retVal += (*it);
 		}
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h
@@ -135,8 +135,8 @@ class W3DBufferManager
 	void releaseSlot(W3DIndexBufferSlot *vbSlot);	///<return slot to pool
 	void freeAllSlots(void);	///<release all slots to pool.
 	void freeAllBuffers(void);	///<release all vertex buffers to pool.
-	void W3DBufferManager::ReleaseResources(void);	///<release D3D/W3D resources.
-	Bool W3DBufferManager::ReAcquireResources(void);	///<reaquire D3D/W3D resources.
+	void ReleaseResources(void);	///<release D3D/W3D resources.
+	Bool ReAcquireResources(void);	///<reaquire D3D/W3D resources.
 	///allows iterating over vertex buffers used by manager.  Input of NULL to get first.
 	W3DVertexBuffer *getNextVertexBuffer(W3DVertexBuffer *pVb, VBM_FVF_TYPES type)
 	{	if (pVb == NULL)
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
@@ -258,8 +258,8 @@ class WaterRenderObjClass : public Snapshot,
 	void cleanupJbaWaterShader(void);
 
 	//Methods used for GeForce3 specific water
-	HRESULT WaterRenderObjClass::generateIndexBuffer(int sizeX, int sizeY);	///<Generate static index buufer
-	HRESULT WaterRenderObjClass::generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doFill);///<Generate static vertex buffer
+	HRESULT generateIndexBuffer(int sizeX, int sizeY);	///<Generate static index buufer
+	HRESULT generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doFill);///<Generate static vertex buffer
 
 	// snapshot methods for save/load
 	virtual void crc( Xfer *xfer );
@@ -268,7 +268,7 @@ class WaterRenderObjClass : public Snapshot,
 
 };
 
-//Public inline function declerations
+//Public inline function declarations
 inline Bool WaterRenderObjClass::worldToGridSpace(Real worldX, Real worldY, Real &gridX, Real &gridY)
 {
 	Real dx,dy;
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h
@@ -80,8 +80,8 @@ class W3DGhostObjectManager : public GhostObjectManager
 	virtual void removeGhostObject(GhostObject *mod);
 	virtual void setLocalPlayerIndex(int index);
 	virtual void updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers);
-	virtual void W3DGhostObjectManager::releasePartitionData(void);
-	virtual void W3DGhostObjectManager::restorePartitionData(void);
+	virtual void releasePartitionData(void);
+	virtual void restorePartitionData(void);
 
 protected:
 	virtual void crc( Xfer *xfer );
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
@@ -275,11 +275,11 @@ class W3DShadowGeometryMesh
 	friend class W3DVolumetricShadow;
 	
 public:
-	W3DShadowGeometryMesh::W3DShadowGeometryMesh( void );
+	W3DShadowGeometryMesh( void );
 #ifdef DO_TERRAIN_SHADOW_VOLUMES
 	virtual
 #endif
-	W3DShadowGeometryMesh::~W3DShadowGeometryMesh( void );
+	~W3DShadowGeometryMesh( void );
 
 	/// @todo: Cache/Store face normals someplace so they are not recomputed when lights move.
 	const Vector3& GetPolygonNormal(long dwPolyNormId) const
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
@@ -66,7 +66,7 @@ static class MouseThreadClass : public ThreadClass
 {
 
 public:
-	MouseThreadClass::MouseThreadClass() : ThreadClass() {}
+	MouseThreadClass() : ThreadClass() {}
 
 	void Thread_Function();
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/collect.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/collect.h
@@ -64,7 +64,7 @@ class CollectionClass : public CompositeRenderObjClass
 	CollectionClass(void);
 	CollectionClass(const CollectionDefClass & def);
 	CollectionClass(const CollectionClass & src);
-	CollectionClass & CollectionClass::operator = (const CollectionClass &);
+	CollectionClass & operator = (const CollectionClass &);
 	virtual ~CollectionClass(void);
 	virtual RenderObjClass *	Clone(void) const;		
 	
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dllist.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dllist.h
@@ -73,6 +73,8 @@ class DLListClass
 template <class T>
 class DLDestroyListClass : public DLListClass<T>
 {
+	using DLListClass<T>::Head;
+
 public:
 	virtual ~DLDestroyListClass()
 	{
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
@@ -158,7 +158,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 	bool														AnyDelayedPassesToRender;
 
 	void Generate_Texture_Categories(Vertex_Split_Table& split_table,unsigned vertex_offset);
-	void DX8FVFCategoryContainer::Insert_To_Texture_Category(
+	void Insert_To_Texture_Category(
 		Vertex_Split_Table& split_table,
 		TextureClass** textures,
 		VertexMaterialClass* mat,
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/intersec.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/intersec.h
@@ -173,15 +173,15 @@ class IntersectionClass
 
 
 	// this copy routine is used when the model coords are needed to be copied along with the other information.
-	inline void IntersectionClass::Copy_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source) {
+	inline void Copy_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source) {
 		Destination->ModelMatrix = Source->ModelMatrix;
 		Destination->ModelLocation = Source->ModelLocation;
 		Copy_Partial_Results(Destination, Source);
 		Destination->IntersectedRenderObject = Source->IntersectedRenderObject;
 	}
 
 
-	inline void IntersectionClass::Copy_Results(IntersectionResultClass *Source) {
+	inline void Copy_Results(IntersectionResultClass *Source) {
 		Copy_Results(&Result, Source);
 	}
 
@@ -190,7 +190,7 @@ class IntersectionClass
 	// otherwise the results are copied into the request structure.
 	// This does not copy the matrix or location members; it is intended to be used during poly testing
 	// where these values are identical between results, or as a completion function for Copy_Results()
-	inline void IntersectionClass::Copy_Partial_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source) 
+	inline void Copy_Partial_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source) 
 	{
 		Destination->IntersectedPolygon = Source->IntersectedPolygon;
 		Destination->Intersection = Source->Intersection;
@@ -225,7 +225,7 @@ class IntersectionClass
 	// this will only set the result's range if intersection occurs; it is intended to be used as a first pass intersection test
 	// before intersecting the mesh polygons itself.
 	// Note: Does NOT do Max_Distance testing
-	inline bool IntersectionClass::Intersect_Sphere_Quick(SphereClass &Sphere, IntersectionResultClass *FinalResult) 
+	inline bool Intersect_Sphere_Quick(SphereClass &Sphere, IntersectionResultClass *FinalResult) 
 	{
 		// make a unit vector from the ray origin to the sphere center
 		Vector3 sphere_vector(Sphere.Center - *RayLocation);
@@ -243,7 +243,7 @@ class IntersectionClass
 
 
 	// this will find the intersection with the sphere and the intersection normal if needed.
-	inline bool IntersectionClass::Intersect_Sphere(SphereClass &Sphere, IntersectionResultClass *FinalResult) 
+	inline bool Intersect_Sphere(SphereClass &Sphere, IntersectionResultClass *FinalResult) 
 	{
 		if(!Intersect_Sphere_Quick(Sphere, FinalResult)) 
 			return false;
@@ -363,22 +363,22 @@ class IntersectionClass
 	**	Designed for use with _Intersect_Triangles_Z.
 	*/
 	//static inline void _Intersect_Lines_Z(Vector3 &A, Vector3 &B, Vector2 &UVStart, Vector2 &UVEnd, Vector3 &C, Vector3 &D, Vector3 ClippedPoints[6], Vector2 ClippedUV[6], int &DestIndex);
-	static inline bool IntersectionClass::In_Front_Of_Line
+	static inline bool In_Front_Of_Line
 	(
 		const Vector3 & p,			// point to test
 		const Vector3 & e0,			// point on edge
 		const Vector3 & de			// direction of edge
 	);
 
-	static inline float IntersectionClass::Intersect_Lines
+	static inline float Intersect_Lines
 	(
 		const Vector3 & p0,			// start of line segment
 		const Vector3 & p1,			// end of line segment
 		const Vector3 & e0,			// point on clipping edge
 		const Vector3 & de			// direction of clipping edge
 	);
 
-	static inline int IntersectionClass::Clip_Triangle_To_LineXY(	
+	static inline int Clip_Triangle_To_LineXY(	
 		int incount,
 		Vector3 * InPoints,
 		Vector2 * InUVs,
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
@@ -184,7 +184,7 @@ class VertexArrayClass
 		delete[] HashTable;
 	}
 
-	void VertexArrayClass::Set_Bounds(const Vector3 & minv,const Vector3 & maxv)
+	void Set_Bounds(const Vector3 & minv,const Vector3 & maxv)
 	{
 		Extent = (maxv - minv) / 2.0f;
 		Center = (maxv + minv) / 2.0f;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/prim_anim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/prim_anim.h
@@ -160,6 +160,10 @@ class PrimitiveAnimationChannelClass
 template<class T>
 class LERPAnimationChannelClass : public PrimitiveAnimationChannelClass<T>
 {
+	using PrimitiveAnimationChannelClass<T>::m_Data;
+	using PrimitiveAnimationChannelClass<T>::m_LastIndex;
+	using PrimitiveAnimationChannelClass<T>::KeyClass;
+
 public:
 
 	/////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rendobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rendobj.h
@@ -238,7 +238,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 
 	RenderObjClass(void);
 	RenderObjClass(const RenderObjClass & src);
-	RenderObjClass & RenderObjClass::operator = (const RenderObjClass &);
+	RenderObjClass & operator = (const RenderObjClass &);
 	virtual ~RenderObjClass(void)																					{ if (RenderHook) delete RenderHook; }
 
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/segline.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/segline.h
@@ -58,7 +58,7 @@ class SegmentedLineClass : public RenderObjClass
 
 		SegmentedLineClass(void);
 		SegmentedLineClass(const SegmentedLineClass & src);
-		SegmentedLineClass & SegmentedLineClass::operator = (const SegmentedLineClass &that);
+		SegmentedLineClass & operator = (const SegmentedLineClass &that);
 		virtual ~SegmentedLineClass(void);
 
 		void					Reset_Line(void);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/streak.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/streak.h
@@ -64,7 +64,7 @@ class StreakLineClass : public RenderObjClass
 
 		StreakLineClass(void);
 		StreakLineClass(const StreakLineClass & src);
-		StreakLineClass & StreakLineClass::operator = (const StreakLineClass &that);
+		StreakLineClass & operator = (const StreakLineClass &that);
 //		virtual ~StreakLineClass(void);
 
 		void					Reset_Line(void);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
@@ -103,9 +103,9 @@ class ThumbnailManagerClass : public DLNodeClass<ThumbnailManagerClass>
 	ThumbnailManagerClass(const char* thumbnail_filename, const char* mix_file_name);
 	~ThumbnailManagerClass();
 
-	void ThumbnailManagerClass::Remove_From_Hash(ThumbnailClass* thumb);
-	void ThumbnailManagerClass::Insert_To_Hash(ThumbnailClass* thumb);
-	ThumbnailClass* ThumbnailManagerClass::Get_From_Hash(const StringClass& name);
+	void Remove_From_Hash(ThumbnailClass* thumb);
+	void Insert_To_Hash(ThumbnailClass* thumb);
+	ThumbnailClass* Get_From_Hash(const StringClass& name);
 
 	void Create_Thumbnails();
 	static void Update_Thumbnail_File(const char* mix_file_name, bool display_message_box);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
@@ -271,7 +271,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	** Apply the render states corresponding to a NULL vetex material to D3D
 	*/
 	static void			Apply_Null(void);
-	unsigned long		VertexMaterialClass::Compute_CRC(void) const;
+	unsigned long		Compute_CRC(void) const;
 
 	static VertexMaterialClass *Presets[PRESET_COUNT];
 };
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/AudioEvents.h
@@ -148,6 +148,10 @@ struct AUDIO_CALLBACK_STRUCT
 template <class T>
 class AudioCallbackListClass : public SimpleDynVecClass< AUDIO_CALLBACK_STRUCT<T> >
 {
+	using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT<T> >::Vector;
+	using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT<T> >::ActiveCount;
+	using SimpleDynVecClass< AUDIO_CALLBACK_STRUCT<T> >::Delete;
+
 public:
 
 	/////////////////////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/Point.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/Point.h
@@ -129,6 +129,10 @@ template<class T>
 class TPoint3D : public TPoint2D<T> {
 		typedef TPoint2D<T> BASECLASS;
 
+	public:
+		using BASECLASS::X;
+		using BASECLASS::Y;
+
 	public:
 		TPoint3D(void) {}		// Default constructor does nothing by design.
 		TPoint3D(T x, T y, T z) : TPoint2D<T>(x, y), Z(z) {}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/Vector.H b/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/Vector.H
@@ -486,6 +486,13 @@ bool VectorClass<T>::Resize(int newsize, T const * array)
 template<class T>
 class DynamicVectorClass : public VectorClass<T>
 {
+	protected:
+		using VectorClass<T>::IsAllocated;
+		using VectorClass<T>::Vector;
+		using VectorClass<T>::VectorMax;
+	public:
+		using VectorClass<T>::Length;
+
 	public:
 		DynamicVectorClass(unsigned size=0, T const * array=0);
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/cpudetect.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/cpudetect.cpp
@@ -1129,7 +1129,7 @@ void CPUDetectClass::Init_Compact_Log()
 static class CPUDetectInitClass
 {
 public:
-	CPUDetectInitClass::CPUDetectInitClass()
+	CPUDetectInitClass()
 	{
 		CPUDetectClass::Init_CPUID_Instruction();
 		// We pretty much need CPUID, but let's not crash if it doesn't exist.
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/multilist.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/multilist.h
@@ -294,6 +294,11 @@ class MultiListClass : public GenericMultiListClass
 template <class ObjectType>
 class MultiListIterator : public GenericMultiListIterator
 {
+protected:
+	using GenericMultiListIterator::CurNode;
+public:
+	using GenericMultiListIterator::First;
+
 public:
 
 	MultiListIterator(MultiListClass<ObjectType> *list) : GenericMultiListIterator(list)	{}
@@ -487,6 +492,12 @@ class RefMultiListIterator : public GenericMultiListIterator
 template <class ObjectType>
 class PriorityMultiListIterator : public MultiListIterator<ObjectType>
 {
+protected:
+	using MultiListIterator<ObjectType>::CurNode;
+public:
+	using MultiListIterator<ObjectType>::First;
+	using MultiListIterator<ObjectType>::Remove_Current_Object;
+
 public:
 	PriorityMultiListIterator(MultiListClass<ObjectType> *list)
 		:	OriginalHead (NULL),
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/simplevec.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/simplevec.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/timer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/timer.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWMath/v3_rnd.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWMath/v3_rnd.h
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class SparseMatchFinder`
`131`	`131`	`AsciiString curBestMatchStr, dupMatchStr;`
`132`	`132`	`#endif`
`133`	`133`
`134`		`- for (std::vector<MATCHABLE>::const_iterator it = v.begin(); it != v.end(); ++it)`
	`134`	`+ for (typename std::vector<MATCHABLE>::const_iterator it = v.begin(); it != v.end(); ++it)`
`135`	`135`	`{`
`136`	`136`	`for (Int i = it->getConditionsYesCount()-1; i >= 0; --i)`
`137`	`137`	`{`
`@@ -197,7 +197,7 @@ class SparseMatchFinder`
`197`	`197`	`//-------------------------------------------------------------------------------------------------`
`198`	`198`	`const MATCHABLE* findBestInfo(const std::vector<MATCHABLE>& v, const BITSET& bits) const`
`199`	`199`	`{`
`200`		`- MatchMap::const_iterator it = m_bestMatches.find(bits);`
	`200`	`+ typename MatchMap::const_iterator it = m_bestMatches.find(bits);`
`201`	`201`
`202`	`202`	`const MATCHABLE *first = NULL;`
`203`	`203`	`if (it != m_bestMatches.end())`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ class ModuleInfo`
`279`	`279`	`ModuleInfo() { }`
`280`	`280`
`281`	`281`	`void addModuleInfo( ThingTemplate thingTemplate, const AsciiString& name, const AsciiString& moduleTag, const ModuleData data, Int interfaceMask, Bool inheritable, Bool overrideableByLikeKind = FALSE );`
`282`		`- const ModuleInfo::Nugget *ModuleInfo::getNuggetWithTag( const AsciiString& tag ) const;`
	`282`	`+ const ModuleInfo::Nugget *getNuggetWithTag( const AsciiString& tag ) const;`
`283`	`283`
`284`	`284`	`Int getCount() const`
`285`	`285`	`{`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ enum FilterModes`
`116`	`116`	`class PickAndPlayInfo`
`117`	`117`	`{`
`118`	`118`	`public:`
`119`		`- PickAndPlayInfo::PickAndPlayInfo(); //INITIALIZE THE CONSTRUCTOR IN CPP`
	`119`	`+ PickAndPlayInfo(); //INITIALIZE THE CONSTRUCTOR IN CPP`
`120`	`120`
`121`	`121`	`Bool m_air; //Are we attacking an airborned target?`
`122`	`122`	`Drawable *m_drawTarget; //Do we have an override draw target?`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ enum`
`50`	`50`
`51`	`51`	`struct RunwayDefinition`
`52`	`52`	`{`
`53`		`- RunwayDefinition::RunwayDefinition()`
	`53`	`+ RunwayDefinition()`
`54`	`54`	`{`
`55`	`55`	`m_catapultParticleSystem = NULL;`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ namespace rts`
`91`	`91`	`T sum(std::vector<T>& vecOfValues )`
`92`	`92`	`{`
`93`	`93`	`T retVal = 0;`
`94`		`- std::vector<T>::iterator it;`
	`94`	`+ typename std::vector<T>::iterator it;`
`95`	`95`	`for (it = vecOfValues.begin(); it != vecOfValues.end(); ++it) {`
`96`	`96`	`retVal += (*it);`
`97`	`97`	`}`