diff options
| author |  archshift | 2015-08-11 19:45:15 -0700 |
|---|---|---|
| committer | archshift | 2015-08-11 19:45:15 -0700 |
| commit | d1ae413ffd4f6a1d36ab67ee8d85c770336e0af3 (patch) | |
| tree | cb108d168ea296d798b99cac1faff36b9ecbe4e1 /src/common/common_funcs.h | |
| parent | Merge pull request #893 from linkmauve/remove-uint._t-int._t (diff) | |
| download | yuzu-d1ae413ffd4f6a1d36ab67ee8d85c770336e0af3.tar.gz yuzu-d1ae413ffd4f6a1d36ab67ee8d85c770336e0af3.tar.xz yuzu-d1ae413ffd4f6a1d36ab67ee8d85c770336e0af3.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | src/common/common_funcs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 59bd16dbf..83b47f61e 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -20,12 +20,13 @@ | |||
| 20 | 20 | ||
| 21 | #ifdef _WIN32 | 21 | #ifdef _WIN32 |
| 22 | // Alignment | 22 | // Alignment |
| 23 | #define FORCE_INLINE __forceinline | ||
| 23 | #define MEMORY_ALIGNED16(x) __declspec(align(16)) x | 24 | #define MEMORY_ALIGNED16(x) __declspec(align(16)) x |
| 24 | #define MEMORY_ALIGNED32(x) __declspec(align(32)) x | 25 | #define MEMORY_ALIGNED32(x) __declspec(align(32)) x |
| 25 | #define MEMORY_ALIGNED64(x) __declspec(align(64)) x | 26 | #define MEMORY_ALIGNED64(x) __declspec(align(64)) x |
| 26 | #define MEMORY_ALIGNED128(x) __declspec(align(128)) x | 27 | #define MEMORY_ALIGNED128(x) __declspec(align(128)) x |
| 27 | #else | 28 | #else |
| 28 | #define __forceinline inline __attribute__((always_inline)) | 29 | #define FORCE_INLINE inline __attribute__((always_inline)) |
| 29 | #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x | 30 | #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x |
| 30 | #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x | 31 | #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x |
| 31 | #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x | 32 | #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x |