sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed CONSTEXPR_OR_INLINE to CXX14_CONSTEXPR

Browse source
This commit is contained in:
Paul Fd 2020-03-11 14:53:25 +01:00
parent f5a47b8f67
commit 976385976c
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/Macros.h
View file

@ -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

4
src/sfizz/MathHelpers.h
View file

@ -129,13 +129,13 @@ constexpr T clamp( T v, T lo, T hi )
}
template<int Increment = 1, class T>
CONSTEXPR_OR_INLINE void incrementAll(T& only)
inline CXX14_CONSTEXPR void incrementAll(T& only)
{
only += Increment;
}
template<int Increment = 1, class T, class... Args>
CONSTEXPR_OR_INLINE void incrementAll(T& first, Args&... rest)
inline CXX14_CONSTEXPR void incrementAll(T& first, Args&... rest)
{
first += Increment;
incrementAll<Increment>(rest...);

4
src/sfizz/SfzHelpers.h
View file

@ -231,7 +231,7 @@ using modFunction = std::function<void(T&, U)>;
* @param modifier the modifier value
*/
template<class T>
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);
}