diff --git a/src/sfizz/Macros.h b/src/sfizz/Macros.h index fd2225c1..f610eefb 100644 --- a/src/sfizz/Macros.h +++ b/src/sfizz/Macros.h @@ -19,7 +19,7 @@ #endif #if __cplusplus > 201103L -#define CONSTEXPR_OR_INLINE constexpr +#define CXX14_CONSTEXPR constexpr #else -#define CONSTEXPR_OR_INLINE inline +#define CXX14_CONSTEXPR #endif diff --git a/src/sfizz/MathHelpers.h b/src/sfizz/MathHelpers.h index ca58b62e..d126992b 100644 --- a/src/sfizz/MathHelpers.h +++ b/src/sfizz/MathHelpers.h @@ -129,13 +129,13 @@ constexpr T clamp( T v, T lo, T hi ) } template -CONSTEXPR_OR_INLINE void incrementAll(T& only) +inline CXX14_CONSTEXPR void incrementAll(T& only) { only += Increment; } template -CONSTEXPR_OR_INLINE void incrementAll(T& first, Args&... rest) +inline CXX14_CONSTEXPR void incrementAll(T& first, Args&... rest) { first += Increment; incrementAll(rest...); diff --git a/src/sfizz/SfzHelpers.h b/src/sfizz/SfzHelpers.h index 10ddcbe3..a50c3428 100644 --- a/src/sfizz/SfzHelpers.h +++ b/src/sfizz/SfzHelpers.h @@ -231,7 +231,7 @@ using modFunction = std::function; * @param modifier the modifier value */ template -CONSTEXPR_OR_INLINE void addToBase(T& base, T modifier) +inline CXX14_CONSTEXPR void addToBase(T& base, T modifier) { base += modifier; } @@ -242,7 +242,7 @@ CONSTEXPR_OR_INLINE void addToBase(T& base, T modifier) * @param base * @param modifier */ -CONSTEXPR_OR_INLINE void multiplyByCents(float& base, int modifier) +inline CXX14_CONSTEXPR void multiplyByCents(float& base, int modifier) { base *= centsFactor(modifier); }