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

8
src/cargotype.h
View File

@@ -85,7 +85,7 @@ struct CargoSpec {
* Determines index of this cargospec
* @return index (in the CargoSpec::array array)
*/
FORCEINLINE CargoID Index() const
inline CargoID Index() const
{
return this - CargoSpec::array;
}
@@ -95,7 +95,7 @@ struct CargoSpec {
* @return is this cargospec valid?
* @note assert(cs->IsValid()) can be triggered when GRF config is modified
*/
FORCEINLINE bool IsValid() const
inline bool IsValid() const
{
return this->bitnum != INVALID_CARGO;
}
@@ -104,7 +104,7 @@ struct CargoSpec {
* Total number of cargospecs, both valid and invalid
* @return length of CargoSpec::array
*/
static FORCEINLINE size_t GetArraySize()
static inline size_t GetArraySize()
{
return lengthof(CargoSpec::array);
}
@@ -114,7 +114,7 @@ struct CargoSpec {
* @param index ID of cargo
* @pre index is a valid cargo ID
*/
static FORCEINLINE CargoSpec *Get(size_t index)
static inline CargoSpec *Get(size_t index)
{
assert(index < lengthof(CargoSpec::array));
return &CargoSpec::array[index];