File 23794-Fix-building-on-GCC-10.patch of Package 0ad

Overview Repositories Revisions Requests Users Attributes Meta

File 23794-Fix-building-on-GCC-10.patch of Package 0ad (Revision 001860c2f2526a471d9036a0e9f3fe63)

Currently displaying revision 001860c2f2526a471d9036a0e9f3fe63 , Show latest

Index: /ps/trunk/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
===================================================================
--- /ps/trunk/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp	(revision 23793)
+++ /ps/trunk/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp	(revision 23794)
@@ -330,15 +330,2 @@
 	}
 }
-
-template <class TYPE, int QUAL>
-xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value)
-{
-	xmlNode* paramNode = AddChild(parentNode, name);
-	AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
-	if (value.IsAnimated())
-	{
-		const FCDAnimated* animated = value.GetAnimated();
-		FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
-	}
-	return paramNode;
-}
Index: /ps/trunk/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
===================================================================
--- /ps/trunk/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h	(revision 23793)
+++ /ps/trunk/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h	(revision 23794)
@@ -554,5 +554,14 @@
 	static void WritePhysicsRigidBodyParameters(FCDPhysicsRigidBodyParameters* physicsRigidBodyParameters, xmlNode* techniqueNode);
 	template <class TYPE, int QUAL>
-	static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value);
+	static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value) {
+		xmlNode* paramNode = AddChild(parentNode, name);
+		AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
+		if (value.IsAnimated())
+		{
+			const FCDAnimated* animated = value.GetAnimated();
+			FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
+		}
+		return paramNode;
+	}
 
 
Index: /ps/trunk/source/simulation2/helpers/HierarchicalPathfinder.cpp
===================================================================
--- /ps/trunk/source/simulation2/helpers/HierarchicalPathfinder.cpp	(revision 23793)
+++ /ps/trunk/source/simulation2/helpers/HierarchicalPathfinder.cpp	(revision 23794)
@@ -752,32 +752,4 @@
 }
 
-template<typename Ordering>
-void HierarchicalPathfinder::FindReachableRegions(RegionID from, std::set<RegionID, Ordering>& reachable, pass_class_t passClass) const
-{
-	// Flood-fill the region graph, starting at 'from',
-	// collecting all the regions that are reachable via edges
-	reachable.insert(from);
-
-	const EdgesMap& edgeMap = m_Edges.at(passClass);
-	if (edgeMap.find(from) == edgeMap.end())
-		return;
-
-	std::vector<RegionID> open;
-	open.reserve(64);
-	open.push_back(from);
-
-	while (!open.empty())
-	{
-		RegionID curr = open.back();
-		open.pop_back();
-
-		for (const RegionID& region : edgeMap.at(curr))
-			// Add to the reachable set; if this is the first time we added
-			// it then also add it to the open list
-			if (reachable.insert(region).second)
-				open.push_back(region);
-	}
-}
-
 void HierarchicalPathfinder::FindGoalRegionsAndBestNavcells(u16 i0, u16 j0, u16 gi, u16 gj, const PathGoal& goal, std::set<InterestingRegion, SortByBestToPoint>& regions, pass_class_t passClass) const
 {
Index: /ps/trunk/source/simulation2/helpers/HierarchicalPathfinder.h
===================================================================
--- /ps/trunk/source/simulation2/helpers/HierarchicalPathfinder.h	(revision 23793)
+++ /ps/trunk/source/simulation2/helpers/HierarchicalPathfinder.h	(revision 23794)
@@ -199,5 +199,30 @@
 	 */
 	template<typename Ordering>
-	void FindReachableRegions(RegionID from, std::set<RegionID, Ordering>& reachable, pass_class_t passClass) const;
+	void FindReachableRegions(RegionID from, std::set<RegionID, Ordering>& reachable, pass_class_t passClass) const
+	{
+		// Flood-fill the region graph, starting at 'from',
+		// collecting all the regions that are reachable via edges
+		reachable.insert(from);
+
+		const EdgesMap& edgeMap = m_Edges.at(passClass);
+		if (edgeMap.find(from) == edgeMap.end())
+			return;
+
+		std::vector<RegionID> open;
+		open.reserve(64);
+		open.push_back(from);
+
+		while (!open.empty())
+		{
+			RegionID curr = open.back();
+			open.pop_back();
+
+			for (const RegionID& region : edgeMap.at(curr))
+				// Add to the reachable set; if this is the first time we added
+				// it then also add it to the open list
+				if (reachable.insert(region).second)
+					open.push_back(region);
+		}
+	}
 
 	struct SortByCenterToPoint

Places

File 23794-Fix-building-on-GCC-10.patch of Package 0ad (Revision 001860c2f2526a471d9036a0e9f3fe63)

Places