games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Merge pull request #651 from snizovtsev/develop

Browse Source 
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
commit a54626459d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/CPathfinder.h
View File

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