From cee8100f1917ce21052b9cf255eeefdc839ae550 Mon Sep 17 00:00:00 2001 From: Minmin Gong Date: Mon, 1 Jul 2019 22:42:21 -0700 Subject: Remove noexcept from sampler functions to match the signature of SamplerT (#309) This change fixes compilation problems on gcc 9.1 with -std=c++17. --- Alc/mixer/mixer_c.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Alc/mixer/mixer_c.cpp') diff --git a/Alc/mixer/mixer_c.cpp b/Alc/mixer/mixer_c.cpp index 80942eab..86a9e438 100644 --- a/Alc/mixer/mixer_c.cpp +++ b/Alc/mixer/mixer_c.cpp @@ -14,13 +14,13 @@ namespace { -inline ALfloat do_point(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei) noexcept +inline ALfloat do_point(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei) { return vals[0]; } -inline ALfloat do_lerp(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei frac) noexcept +inline ALfloat do_lerp(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei frac) { return lerp(vals[0], vals[1], frac * (1.0f/FRACTIONONE)); } -inline ALfloat do_cubic(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei frac) noexcept +inline ALfloat do_cubic(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei frac) { return cubic(vals[0], vals[1], vals[2], vals[3], frac * (1.0f/FRACTIONONE)); } -inline ALfloat do_bsinc(const InterpState &istate, const ALfloat *RESTRICT vals, const ALsizei frac) noexcept +inline ALfloat do_bsinc(const InterpState &istate, const ALfloat *RESTRICT vals, const ALsizei frac) { ASSUME(istate.bsinc.m > 0); -- cgit v1.2.3