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

6
src/waypoint_base.h
View File

@@ -27,7 +27,7 @@ struct Waypoint FINAL : SpecializedStation<Waypoint, true> {
void UpdateVirtCoord();
/* virtual */ FORCEINLINE bool TileBelongsToRailStation(TileIndex tile) const
/* virtual */ inline bool TileBelongsToRailStation(TileIndex tile) const
{
return IsRailWaypointTile(tile) && GetStationIndex(tile) == this->index;
}
@@ -50,7 +50,7 @@ struct Waypoint FINAL : SpecializedStation<Waypoint, true> {
* Is this a single tile waypoint?
* @return true if it is.
*/
FORCEINLINE bool IsSingleTile() const
inline bool IsSingleTile() const
{
return (this->facilities & FACIL_TRAIN) != 0 && this->train_station.w == 1 && this->train_station.h == 1;
}
@@ -61,7 +61,7 @@ struct Waypoint FINAL : SpecializedStation<Waypoint, true> {
* @param wp The waypoint to compare to.
* @return true iff their types are equal.
*/
FORCEINLINE bool IsOfType(const Waypoint *wp) const
inline bool IsOfType(const Waypoint *wp) const
{
return this->string_id == wp->string_id;
}