From d1ae413ffd4f6a1d36ab67ee8d85c770336e0af3 Mon Sep 17 00:00:00 2001 From: archshift Date: Tue, 11 Aug 2015 19:45:15 -0700 Subject: Stop defining GCC always_inline attributes as __forceinline __forceinline is a MSVC extension, which may confuse some people working on the codebase. Furthermore, the C++ standard dictates that all names which contain adjacent underscores are reserved. --- src/common/common_funcs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/common/common_funcs.h') diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 59bd16db..83b47f61 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -20,12 +20,13 @@ #ifdef _WIN32 // Alignment + #define FORCE_INLINE __forceinline #define MEMORY_ALIGNED16(x) __declspec(align(16)) x #define MEMORY_ALIGNED32(x) __declspec(align(32)) x #define MEMORY_ALIGNED64(x) __declspec(align(64)) x #define MEMORY_ALIGNED128(x) __declspec(align(128)) x #else - #define __forceinline inline __attribute__((always_inline)) + #define FORCE_INLINE inline __attribute__((always_inline)) #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x -- cgit v1.2.3