diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-12-12 02:15:52 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-12-12 13:08:03 +0100 |
| commit | 460536209b741bc469f1b0857775449abb2102fb (patch) | |
| tree | 4bc7f636b86ab2531811827d0fd0c33011a7280e /runtime/base | |
| parent | 19031d51ab9edfc3b1996891d654a6b86ca937c0 (diff) | |
| download | art-460536209b741bc469f1b0857775449abb2102fb.zip art-460536209b741bc469f1b0857775449abb2102fb.tar.gz art-460536209b741bc469f1b0857775449abb2102fb.tar.bz2 | |
Don't rely on gcc extensions
Make the code more compatible with different compilers.
clang doesn't allow extra static qualifiers on template
specializations, const qualifiers on function types,
or inline attributes on lambda functions, and is more
picky about casting away constness with reinterpret_cast.
These modifications are compatible with both gcc and
clang.
Change-Id: I739b10df2780bec537827a13679fd2bcc2cc7188
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/macros.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/runtime/base/macros.h b/runtime/base/macros.h index 00a530a..cf7029a 100644 --- a/runtime/base/macros.h +++ b/runtime/base/macros.h @@ -140,6 +140,13 @@ char (&ArraySizeHelper(T (&array)[N]))[N]; #define ALWAYS_INLINE __attribute__ ((always_inline)) #endif +#ifdef __clang__ +/* clang doesn't like attributes on lambda functions */ +#define ALWAYS_INLINE_LAMBDA +#else +#define ALWAYS_INLINE_LAMBDA ALWAYS_INLINE +#endif + #if defined (__APPLE__) #define HOT_ATTR #define COLD_ATTR |