From dcc10a3b8f6bf7bdf7629b176e53827cf9b0d1bf Mon Sep 17 00:00:00 2001 From: smatz Date: Sun, 3 Aug 2008 20:50:12 +0000 Subject: [PATCH] (svn r13985) -Fix (r13944): gcc 2.95 compilation --- src/yapf/yapf_destrail.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/yapf/yapf_destrail.hpp b/src/yapf/yapf_destrail.hpp index 9790758e47..a048ebfd44 100644 --- a/src/yapf/yapf_destrail.hpp +++ b/src/yapf/yapf_destrail.hpp @@ -70,6 +70,7 @@ public: typedef typename Types::Tpf Tpf; ///< the pathfinder class (derived from THIS class) typedef typename Types::NodeList::Titem Node; ///< this will be our node type typedef typename Node::Key Key; ///< key to hash tables + typedef typename Types::TrackFollower TrackFollower; ///< TrackFollower. Need to typedef for gcc 2.95 /// to access inherited path finder Tpf& Yapf() {return *static_cast(this);} @@ -84,8 +85,8 @@ public: FORCEINLINE bool PfDetectDestination(TileIndex tile, Trackdir td) { return - IsSafeWaitingPosition(Yapf().GetVehicle(), tile, td, true, Types::TrackFollower::Allow90degTurns()) && - IsWaitingPositionFree(Yapf().GetVehicle(), tile, td, Types::TrackFollower::Allow90degTurns()); + IsSafeWaitingPosition(Yapf().GetVehicle(), tile, td, true, TrackFollower::Allow90degTurns()) && + IsWaitingPositionFree(Yapf().GetVehicle(), tile, td, TrackFollower::Allow90degTurns()); } /** Called by YAPF to calculate cost estimate. Calculates distance to the destination