From de654aa5fa74a0be7d44de5b6cadbb9950af927e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?furby=E2=84=A2?= Date: Sun, 12 Nov 2023 04:30:09 -0600 Subject: [PATCH] Header reshapery, outlaw stdlib using wrong math. * For platforms that don't care about casing such as all but Linux platforms, there was a big oh-whoopsie if the current header search path had a Math.h in it, in this case, it was , and well, obviously the cstd library doesn't appreciate that very much! * so we therefore yeeted OpenVDB/Math out of the ever-finding search path, and you are now forced to prefix that include, I suppose we could have just renamed it too but it seems fine. --- Sources/OpenVDB/include/openvdb/math/Operators.h | 8 ++++---- Sources/OpenVDB/include/openvdb/math/Ray.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Sources/OpenVDB/include/openvdb/math/Operators.h b/Sources/OpenVDB/include/openvdb/math/Operators.h index 7f9f9238..023ae102 100644 --- a/Sources/OpenVDB/include/openvdb/math/Operators.h +++ b/Sources/OpenVDB/include/openvdb/math/Operators.h @@ -6,10 +6,10 @@ #ifndef OPENVDB_MATH_OPERATORS_HAS_BEEN_INCLUDED #define OPENVDB_MATH_OPERATORS_HAS_BEEN_INCLUDED -#include "math/FiniteDifference.h" -#include "math/Stencils.h" -#include "math/Maps.h" -#include "math/Transform.h" +#include "openvdb/math/FiniteDifference.h" +#include "openvdb/math/Stencils.h" +#include "openvdb/math/Maps.h" +#include "openvdb/math/Transform.h" #include // for std::sqrt() diff --git a/Sources/OpenVDB/include/openvdb/math/Ray.h b/Sources/OpenVDB/include/openvdb/math/Ray.h index a4ec0665..66cae4a1 100644 --- a/Sources/OpenVDB/include/openvdb/math/Ray.h +++ b/Sources/OpenVDB/include/openvdb/math/Ray.h @@ -10,9 +10,9 @@ #ifndef OPENVDB_MATH_RAY_HAS_BEEN_INCLUDED #define OPENVDB_MATH_RAY_HAS_BEEN_INCLUDED -#include "math/Math.h" -#include "math/Vec3.h" -#include "math/Transform.h" +#include "openvdb/math/Math.h" +#include "openvdb/math/Vec3.h" +#include "openvdb/math/Transform.h" #include // for std::swap() #include // for std::ostream #include // for std::numeric_limits::max()