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/subsidy_base.h | |
| 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/subsidy_base.h')
| -rw-r--r-- | src/subsidy_base.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/subsidy_base.h b/src/subsidy_base.h index 5c09260ad..d0f1fa655 100644 --- a/src/subsidy_base.h +++ b/src/subsidy_base.h @@ -33,18 +33,18 @@ struct Subsidy : SubsidyPool::PoolItem<&_subsidy_pool> { /** * We need an (empty) constructor so struct isn't zeroed (as C++ standard states) */ - FORCEINLINE Subsidy() { } + inline Subsidy() { } /** * (Empty) destructor has to be defined else operator delete might be called with NULL parameter */ - FORCEINLINE ~Subsidy() { } + inline ~Subsidy() { } /** * Tests whether this subsidy has been awarded to someone * @return is this subsidy awarded? */ - FORCEINLINE bool IsAwarded() const + inline bool IsAwarded() const { return this->awarded != INVALID_COMPANY; } |