dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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)

Browse Source
This commit is contained in:
truebrain
2011-12-20 17:57:56 +00:00
parent 990045e2b3
commit aa1a0053b0
75 changed files with 673 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/depot_base.h
View File

@@ -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);
}