From 015ff3d6083a6ea6f7d9e30b22cfe080c81c04a5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 26 Sep 2024 09:22:09 -0400 Subject: #include rather than "math.h" to avoid lerp() conflict. GCC on Linux complains that "math.h", which hoists all the standard library math functions into the global namespace for classic C compatibility, creates a conflict between `std::lerp()` and the `lerp()` function in llmath.h. (Perhaps we should just replace our `lerp()` definition with `using std::lerp;`) Anyway, bringing in rather than "math.h" leaves standard library math functions in the `std` namespace, avoiding the conflict. --- indra/llmath/raytrace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmath/raytrace.cpp') diff --git a/indra/llmath/raytrace.cpp b/indra/llmath/raytrace.cpp index 893bf1fc70..1251ab9f8d 100644 --- a/indra/llmath/raytrace.cpp +++ b/indra/llmath/raytrace.cpp @@ -26,7 +26,7 @@ #include "linden_common.h" -#include "math.h" +#include //#include "vmath.h" #include "v3math.h" #include "llquaternion.h" -- cgit v1.2.3 From bd252f8151f777508efb15cfe2c69c9a103d98be Mon Sep 17 00:00:00 2001 From: Ansariel Hiller Date: Sat, 5 Oct 2024 07:07:01 +0200 Subject: Follow up for 39eb250 (#2815) --- indra/llmath/raytrace.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llmath/raytrace.cpp') diff --git a/indra/llmath/raytrace.cpp b/indra/llmath/raytrace.cpp index 893bf1fc70..c0b5f48f2d 100644 --- a/indra/llmath/raytrace.cpp +++ b/indra/llmath/raytrace.cpp @@ -27,7 +27,6 @@ #include "linden_common.h" #include "math.h" -//#include "vmath.h" #include "v3math.h" #include "llquaternion.h" #include "m3math.h" -- cgit v1.2.3