From 9e23d771bc66db6a75a3342ae586389989109f46 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 16 Feb 2022 21:19:17 +0100 Subject: [PATCH] Fix invalid initialization of constexpr. --- code/AssetLib/IFC/IFCGeometry.cpp | 2 +- include/assimp/defs.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp index 401ff9de6..ef5954251 100644 --- a/code/AssetLib/IFC/IFCGeometry.cpp +++ b/code/AssetLib/IFC/IFCGeometry.cpp @@ -527,7 +527,7 @@ IfcMatrix3 DerivePlaneCoordinateSpace(const TempMesh& curmesh, bool& ok, IfcVect return m; } -constexpr auto closeDistance = ai_epsilon; +const auto closeDistance = ai_epsilon; bool areClose(Schema_2x3::IfcCartesianPoint pt1,Schema_2x3::IfcCartesianPoint pt2) { if(pt1.Coordinates.size() != pt2.Coordinates.size()) diff --git a/include/assimp/defs.h b/include/assimp/defs.h index b85f14b7e..0626a8d8a 100644 --- a/include/assimp/defs.h +++ b/include/assimp/defs.h @@ -279,8 +279,8 @@ typedef unsigned int ai_uint; #define AI_MATH_HALF_PI_F (AI_MATH_PI_F * 0.5f) /* Tiny macro to convert from radians to degrees and back */ -#define AI_DEG_TO_RAD(x) ((x) * (ai_real)0.0174532925) -#define AI_RAD_TO_DEG(x) ((x) * (ai_real)57.2957795) +#define AI_DEG_TO_RAD(x) ((x) * (ai_real) 0.0174532925) +#define AI_RAD_TO_DEG(x) ((x) * (ai_real) 57.2957795) /* Numerical limits */ static const ai_real ai_epsilon = (ai_real) 1e-6;