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/window_gui.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/window_gui.h')
-rw-r--r-- | src/window_gui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window_gui.h b/src/window_gui.h index a0c03805d..1e5fb5a39 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -263,7 +263,7 @@ public: * to destruct them all at the same time too, which is kinda hard. * @param size the amount of space not to allocate */ - FORCEINLINE void *operator new[](size_t size) + inline void *operator new[](size_t size) { NOT_REACHED(); } @@ -273,7 +273,7 @@ public: * Don't free the window directly; it corrupts the linked list when iterating * @param ptr the pointer not to free */ - FORCEINLINE void operator delete(void *ptr) + inline void operator delete(void *ptr) { } |