(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)
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user