Skip to content

Commit 8745bd6

Browse files
committed
FIx for windows
1 parent b1d15f0 commit 8745bd6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Core/GeometryPrimitives/BBox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@ namespace Geometry {
164164
{
165165
/// @todo: C assert: assert(is_valid_);
166166
Vector diagonal(cmax_-cmin_);
167-
return std::max({diagonal.x(), diagonal.y(), diagonal.z()});
167+
return (std::max)({diagonal.x(), diagonal.y(), diagonal.z()});
168168
}
169169

170170
inline double shortest_edge() const
171171
{
172172
/// @todo: C assert: assert(is_valid_);
173173
Vector diagonal(cmax_-cmin_);
174-
return std::min({diagonal.x(), diagonal.y(), diagonal.z()});
174+
return (std::min)({diagonal.x(), diagonal.y(), diagonal.z()});
175175
}
176176

177177
/// Check whether two BBoxes are similar

src/Core/GeometryPrimitives/Vector.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,12 @@ inline double Vector::length2() const
251251

252252
inline double Vector::minComponent() const
253253
{
254-
return std::min({d_[0], d_[1], d_[2]});
254+
return (std::min)({d_[0], d_[1], d_[2]});
255255
}
256256

257257
inline double Vector::maxComponent() const
258258
{
259-
return std::max({d_[0], d_[1], d_[2]});
259+
return (std::max)({d_[0], d_[1], d_[2]});
260260
}
261261

262262
inline Vector Vector::operator/(const double d) const

0 commit comments

Comments
 (0)