From e566f9760246a54fda4dadade08d5ef15b5d8fc2 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 27 Feb 2025 13:56:04 +0800
Subject: Avoid redefinition of lerp on GCC by using std's
to avoid conflict errors with GCC C++20 cmath's.
---
indra/llmath/llmath.h | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'indra/llmath')
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index fa315291a3..a72993a21a 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -358,10 +358,14 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs)
return new_foo;
}
+#ifdef __GNUC__
+using std::lerp;
+#else
inline F32 lerp(F32 a, F32 b, F32 u)
{
return a + ((b - a) * u);
}
+#endif
inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v)
{
--
cgit v1.2.3