diff options
| author | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
| commit | 6a9fe1e2c1c06b6bc04c3b78e2a9f69dd7a5ec6e (patch) | |
| tree | a6ffd2560ab4e6b632b2db5f8e6db6de7823d7dd /core/mixer/mixer_c.cpp | |
| parent | 707f4cca27e096c167e79619642fbe2e872ee4c8 (diff) | |
Rename lerp to avoid conflicts with C++20's std::lerp
Diffstat (limited to 'core/mixer/mixer_c.cpp')
| -rw-r--r-- | core/mixer/mixer_c.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mixer/mixer_c.cpp b/core/mixer/mixer_c.cpp index f82f7dd1..f3e6aa6a 100644 --- a/core/mixer/mixer_c.cpp +++ b/core/mixer/mixer_c.cpp @@ -26,7 +26,7 @@ constexpr uint FracPhaseDiffOne{1 << FracPhaseBitDiff}; inline float do_point(const InterpState&, const float *RESTRICT vals, const uint) { return vals[0]; } inline float do_lerp(const InterpState&, const float *RESTRICT vals, const uint frac) -{ return lerp(vals[0], vals[1], static_cast<float>(frac)*(1.0f/MixerFracOne)); } +{ return lerpf(vals[0], vals[1], static_cast<float>(frac)*(1.0f/MixerFracOne)); } inline float do_cubic(const InterpState&, const float *RESTRICT vals, const uint frac) { return cubic(vals[0], vals[1], vals[2], vals[3], static_cast<float>(frac)*(1.0f/MixerFracOne)); } inline float do_bsinc(const InterpState &istate, const float *RESTRICT vals, const uint frac) |