From aa35b6a4793825b9b66c74a76c676e9185cb16f2 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Thu, 1 Apr 2021 08:32:07 +1100 Subject: [PATCH] - binaryangle.h: Fix constexpr issue on GCC builds following bf2d8078a4418eed5386faf904ca075d2af587d5. --- source/core/binaryangle.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/binaryangle.h b/source/core/binaryangle.h index acf5b82f2..373f5a02e 100644 --- a/source/core/binaryangle.h +++ b/source/core/binaryangle.h @@ -398,7 +398,7 @@ class fixedhoriz friend constexpr fixedhoriz q16horiz(fixed_t v); friend constexpr fixedhoriz buildhoriz(int v); - friend constexpr fixedhoriz buildfhoriz(double v); + friend fixedhoriz buildfhoriz(double v); friend fixedhoriz pitchhoriz(double v); friend fixedhoriz bamhoriz(int32_t v); @@ -497,7 +497,7 @@ public: inline constexpr fixedhoriz q16horiz(fixed_t v) { return fixedhoriz(v); } inline constexpr fixedhoriz buildhoriz(int v) { return fixedhoriz(IntToFixed(v)); } -inline constexpr fixedhoriz buildfhoriz(double v) { return fixedhoriz(FloatToFixed(v)); } +inline fixedhoriz buildfhoriz(double v) { return fixedhoriz(FloatToFixed(v)); } inline fixedhoriz pitchhoriz(double v) { return fixedhoriz(PitchToHoriz(v)); } inline fixedhoriz bamhoriz(int32_t v) { return pitchhoriz(BAMToPitch(v)); }