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/core/alloc_func.hpp | |
| 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/core/alloc_func.hpp')
| -rw-r--r-- | src/core/alloc_func.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/alloc_func.hpp b/src/core/alloc_func.hpp index 4ba8c5f53..c7e17421f 100644 --- a/src/core/alloc_func.hpp +++ b/src/core/alloc_func.hpp @@ -56,7 +56,7 @@ static inline void CheckAllocationConstraints(size_t num_elements) * @return NULL when num_elements == 0, non-NULL otherwise. */ template <typename T> -static FORCEINLINE T *MallocT(size_t num_elements) +static inline T *MallocT(size_t num_elements) { /* * MorphOS cannot handle 0 elements allocations, or rather that always @@ -84,7 +84,7 @@ static FORCEINLINE T *MallocT(size_t num_elements) * @return NULL when num_elements == 0, non-NULL otherwise. */ template <typename T> -static FORCEINLINE T *CallocT(size_t num_elements) +static inline T *CallocT(size_t num_elements) { /* * MorphOS cannot handle 0 elements allocations, or rather that always @@ -110,7 +110,7 @@ static FORCEINLINE T *CallocT(size_t num_elements) * @return NULL when num_elements == 0, non-NULL otherwise. */ template <typename T> -static FORCEINLINE T *ReallocT(T *t_ptr, size_t num_elements) +static inline T *ReallocT(T *t_ptr, size_t num_elements) { /* * MorphOS cannot handle 0 elements allocations, or rather that always |