Mercurial > hg > openttd
changeset 9842:53728ca3a8e5 draft
(svn r13985) -Fix (r13944): gcc 2.95 compilation
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Sun, 03 Aug 2008 20:50:12 +0000 |
| parents | 1f45eff04187 |
| children | afd919aa07c3 |
| files | src/yapf/yapf_destrail.hpp |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/yapf/yapf_destrail.hpp +++ b/src/yapf/yapf_destrail.hpp @@ -70,6 +70,7 @@ 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<Tpf*>(this);} @@ -84,8 +85,8 @@ 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