diff --git a/manifold/src/constructors.cu b/manifold/src/constructors.cu index 3fdf90f5e..4e639ef9e 100644 --- a/manifold/src/constructors.cu +++ b/manifold/src/constructors.cu @@ -153,7 +153,7 @@ Manifold Manifold::Cube(glm::vec3 size, bool center) { Manifold Manifold::Cylinder(float height, float radiusLow, float radiusHigh, int circularSegments, bool center) { float scale = radiusHigh >= 0.0f ? radiusHigh / radiusLow : 1.0f; - float radius = max(radiusLow, radiusHigh); + float radius = fmax(radiusLow, radiusHigh); int n = circularSegments > 2 ? circularSegments : GetCircularSegments(radius); Polygons circle(1); float dPhi = 360.0f / n; @@ -283,7 +283,7 @@ Manifold Manifold::Revolve(const Polygons& crossSection, int circularSegments) { float radius = 0.0f; for (const auto& poly : crossSection) { for (const auto& vert : poly) { - radius = max(radius, vert.pos.x); + radius = fmax(radius, vert.pos.x); } } int nDivisions = diff --git a/manifold/src/manifold.cu b/manifold/src/manifold.cu index 480023cf5..4d51ad1de 100644 --- a/manifold/src/manifold.cu +++ b/manifold/src/manifold.cu @@ -186,7 +186,7 @@ int Manifold::GetCircularSegments(float radius) { if (Manifold::circularSegments_ > 0) return Manifold::circularSegments_; int nSegA = 360.0f / Manifold::circularAngle_; int nSegL = 2.0f * radius * glm::pi() / Manifold::circularEdgeLength_; - int nSeg = min(nSegA, nSegL) + 3; + int nSeg = fmin(nSegA, nSegL) + 3; nSeg -= nSeg % 4; return nSeg; } diff --git a/utilities/include/sparse.cuh b/utilities/include/sparse.cuh index 26ed09a99..f1337b0a6 100644 --- a/utilities/include/sparse.cuh +++ b/utilities/include/sparse.cuh @@ -23,6 +23,8 @@ #include "utils.cuh" #include "vec_dh.cuh" +#include + namespace manifold { /** @ingroup Private */