From 1c9bec19993417b1f3b240f2bdb0745aa26c0cb3 Mon Sep 17 00:00:00 2001 From: truebrain Date: Tue, 20 Dec 2011 17:57:56 +0000 Subject: (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) --- src/depot_base.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/depot_base.h') diff --git a/src/depot_base.h b/src/depot_base.h index 04957c8cb..e5eb3b622 100644 --- a/src/depot_base.h +++ b/src/depot_base.h @@ -29,7 +29,7 @@ struct Depot : DepotPool::PoolItem<&_depot_pool> { Depot(TileIndex xy = INVALID_TILE) : xy(xy) {} ~Depot(); - static FORCEINLINE Depot *GetByTile(TileIndex tile) + static inline Depot *GetByTile(TileIndex tile) { return Depot::Get(GetDepotIndex(tile)); } @@ -40,7 +40,7 @@ struct Depot : DepotPool::PoolItem<&_depot_pool> { * @param d The depot to compare to. * @return true iff their types are equal. */ - FORCEINLINE bool IsOfType(const Depot *d) const + inline bool IsOfType(const Depot *d) const { return GetTileType(d->xy) == GetTileType(this->xy); } -- cgit v1.2.3-54-g00ecf