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

Switch between inline and constexpr for c++ version

Browse source
This commit is contained in:
Paul Ferrand 2020-03-11 01:06:05 +01:00 • committed by Paul Fd
parent 17c4f87d4b
commit ad44c2cea9
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sfizz/Macros.h
View file

@ -17,3 +17,9 @@
#else
#define SFIZZ_EXPORTED_API
#endif
#if __cplusplus > 201103L
#define CONSTEXPR_OR_INLINE constexpr
#else
#define CONSTEXPR_OR_INLINE inline
#endif

5
src/sfizz/MathHelpers.h
View file

@ -10,6 +10,7 @@
*/
#pragma once
#include "Config.h"
#include "Macros.h"
#include <algorithm>
#include <cmath>
#include <random>
@ -128,13 +129,13 @@ constexpr T clamp( T v, T lo, T hi )
}
template<int Increment = 1, class T>
constexpr void incrementAll(T& only)
CONSTEXPR_OR_INLINE void incrementAll(T& only)
{
only += Increment;
}
template<int Increment = 1, class T, class... Args>
constexpr void incrementAll(T& first, Args&... rest)
CONSTEXPR_OR_INLINE void incrementAll(T& first, Args&... rest)
{
first += Increment;
incrementAll<Increment>(rest...);

5
src/sfizz/SfzHelpers.h
View file

@ -10,6 +10,7 @@
//#include <string>
#include <array>
#include <cmath>
#include "Macros.h"
#include "Config.h"
#include "MathHelpers.h"
@ -230,7 +231,7 @@ using modFunction = std::function<void(T&, U)>;
* @param modifier the modifier value
*/
template<class T>
constexpr void addToBase(T& base, T modifier)
CONSTEXPR_OR_INLINE void addToBase(T& base, T modifier)
{
base += modifier;
}
@ -241,7 +242,7 @@ constexpr void addToBase(T& base, T modifier)
* @param base
* @param modifier
*/
inline void multiplyByCents(float& base, int modifier)
CONSTEXPR_OR_INLINE void multiplyByCents(float& base, int modifier)
{
base *= centsFactor(modifier);
}