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/cargopacket.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/cargopacket.cpp')
| -rw-r--r-- | src/cargopacket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp index 8bd6b651d..0b92de0c8 100644 --- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -82,7 +82,7 @@ CargoPacket::CargoPacket(uint16 count, byte days_in_transit, StationID source, T * @param new_size Size of the remaining part. * @return Split off part, or NULL if no packet could be allocated! */ -FORCEINLINE CargoPacket *CargoPacket::Split(uint new_size) +inline CargoPacket *CargoPacket::Split(uint new_size) { if (!CargoPacket::CanAllocateItem()) return NULL; @@ -97,7 +97,7 @@ FORCEINLINE CargoPacket *CargoPacket::Split(uint new_size) * Merge another packet into this one. * @param cp Packet to be merged in. */ -FORCEINLINE void CargoPacket::Merge(CargoPacket *cp) +inline void CargoPacket::Merge(CargoPacket *cp) { this->count += cp->count; this->feeder_share += cp->feeder_share; |