diff options
author | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
---|---|---|
committer | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
commit | 1c9bec19993417b1f3b240f2bdb0745aa26c0cb3 (patch) | |
tree | d09407cc962ee87ac1bbbbc60951cad74c6b1db7 /src/vehicle_gui.cpp | |
parent | 7a38642a1c83531a65907ae784bc03a82d35132a (diff) | |
download | openttd-1c9bec19993417b1f3b240f2bdb0745aa26c0cb3.tar.xz |
(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)
Diffstat (limited to 'src/vehicle_gui.cpp')
-rw-r--r-- | src/vehicle_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 81e17e694..006f6278b 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -297,7 +297,7 @@ struct RefitOption { * @param other Compare to this #RefitOption. * @return True if both #RefitOption are different. */ - FORCEINLINE bool operator != (const RefitOption &other) const + inline bool operator != (const RefitOption &other) const { return other.cargo != this->cargo || other.value != this->value; } @@ -307,7 +307,7 @@ struct RefitOption { * @param other Compare to this #RefitOption. * @return True if both #RefitOption are equal. */ - FORCEINLINE bool operator == (const RefitOption &other) const + inline bool operator == (const RefitOption &other) const { return other.cargo == this->cargo && other.value == this->value; } |