Browse Source

Merge pull request #651 from snizovtsev/develop

lib: fix CPathfinder build error on GCC 10.2
Alexander Shishkin 5 years ago
parent
commit
a54626459d
1 changed files with 7 additions and 16 deletions
  1. 7 16
      lib/CPathfinder.h

+ 7 - 16
lib/CPathfinder.h

@@ -149,22 +149,13 @@ struct DLL_LINKAGE CGPathNode
 		return turns < 255;
 	}
 
-	boost::heap::detail::node_handle
-	<
-		boost::heap::detail::marked_heap_node<CGPathNode *>*,
-		boost::heap::detail::make_fibonacci_heap_base
-		<
-			CGPathNode *,
-			boost::parameter::aux::arg_list
-			<
-				boost::heap::compare<NodeComparer<CGPathNode>>,
-				boost::parameter::aux::empty_arg_list
-			>
-		>::type,
-		CGPathNode *&
-	> pqHandle;
-
-	boost::heap::fibonacci_heap< CGPathNode *, boost::heap::compare<NodeComparer<CGPathNode>> >* pq;
+	typedef boost::heap::fibonacci_heap<
+		CGPathNode *,
+		boost::heap::compare<NodeComparer<CGPathNode>>
+	> TFibHeap;
+
+	TFibHeap::handle_type pqHandle;
+	TFibHeap* pq;
 
 private:
 	float cost; //total cost of the path to this tile measured in turns with fractions