diff options
| author | Chris Robinson <[email protected]> | 2023-09-17 00:09:18 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2023-09-17 00:09:18 -0700 |
| commit | c4ce0ec4411f21e0a2f8485588717c59f0b9970c (patch) | |
| tree | d27d078ef3f2298d6bfc92f90314c881ef4edc88 | |
| parent | 2e293ee7cbc6f0dbd069ba7c678d20c1af16872f (diff) | |
Rename noinline to NOINLINE
To avoid clashes with compilers that use it as a keyword already
| -rw-r--r-- | al/source.cpp | 4 | ||||
| -rw-r--r-- | common/opthelpers.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/al/source.cpp b/al/source.cpp index d5ac8f45..9289d25c 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -1423,7 +1423,7 @@ auto GetCheckers(ALCcontext *const Context, const SourceProp prop, const al::spa } template<typename T> -noinline void SetProperty(ALsource *const Source, ALCcontext *const Context, const SourceProp prop, +NOINLINE void SetProperty(ALsource *const Source, ALCcontext *const Context, const SourceProp prop, const al::span<const T> values) try { auto&& [CheckSize, CheckValue] = GetCheckers(Context, prop, values); @@ -2008,7 +2008,7 @@ auto GetSizeChecker(ALCcontext *const Context, const SourceProp prop, const al:: } template<typename T> -[[nodiscard]] noinline +[[nodiscard]] NOINLINE bool GetProperty(ALsource *const Source, ALCcontext *const Context, const SourceProp prop, const al::span<T> values) try { diff --git a/common/opthelpers.h b/common/opthelpers.h index cc606b9e..dc43ccdb 100644 --- a/common/opthelpers.h +++ b/common/opthelpers.h @@ -19,13 +19,13 @@ #ifdef __GNUC__ #define force_inline [[gnu::always_inline]] inline -#define noinline [[gnu::noinline]] +#define NOINLINE [[gnu::noinline]] #elif defined(_MSC_VER) #define force_inline __forceinline -#define noinline __declspec(noinline) +#define NOINLINE __declspec(noinline) #else #define force_inline inline -#define noinline +#define NOINLINE #endif /* Unlike the likely attribute, ASSUME requires the condition to be true or |