diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-10-02 13:53:53 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2018-10-02 13:54:15 -0300 |
| commit | 75c29879b0c0b100415b2abd1992994656d06aec (patch) | |
| tree | 6716860f0e81c0be225a9ea7592004302ee2840f | |
| parent | ff1794a7a080e30cff4dd1efb99289ab1f4f267d (diff) | |
Disable forced inline when building in debug.
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | core/typedefs.h | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index a056a0c3ae..1898e0b5d3 100644 --- a/SConstruct +++ b/SConstruct @@ -234,7 +234,8 @@ env_base.platform_exporters = platform_exporters env_base.platform_apis = platform_apis if (env_base['target'] == 'debug'): - env_base.Append(CPPDEFINES=['DEBUG_MEMORY_ALLOC']) + env_base.Append(CPPDEFINES=['DEBUG_MEMORY_ALLOC','DISABLE_FORCED_INLINE']) + if (env_base['no_editor_splash']): env_base.Append(CPPDEFINES=['NO_EDITOR_SPLASH']) diff --git a/core/typedefs.h b/core/typedefs.h index 2b26bf08f7..5c15da9c2d 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -44,6 +44,7 @@ #define _MKSTR(m_x) _STR(m_x) #endif +//should always inline no matter what #ifndef _ALWAYS_INLINE_ #if defined(__GNUC__) && (__GNUC__ >= 4) @@ -58,10 +59,17 @@ #endif +//should always inline, except in some cases because it makes debugging harder #ifndef _FORCE_INLINE_ + +#ifdef DISABLE_FORCED_INLINE +#define _FORCE_INLINE_ inline +#else #define _FORCE_INLINE_ _ALWAYS_INLINE_ #endif +#endif + //custom, gcc-safe offsetof, because gcc complains a lot. template <class T> T *_nullptr() { |