Merge pull request #651 from snizovtsev/develop

lib: fix CPathfinder build error on GCC 10.2
This commit is contained in:
Alexander Shishkin
2020-09-30 16:53:20 +03:00
committed by GitHub
+6 -15
View File
@@ -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;
typedef boost::heap::fibonacci_heap<
CGPathNode *,
boost::heap::compare<NodeComparer<CGPathNode>>
> TFibHeap;
boost::heap::fibonacci_heap< CGPathNode *, boost::heap::compare<NodeComparer<CGPathNode>> >* pq;
TFibHeap::handle_type pqHandle;
TFibHeap* pq;
private:
float cost; //total cost of the path to this tile measured in turns with fractions