songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix VC problem with max

This commit is contained in:
Andreas Fabri 2021-12-28 09:54:21 +00:00
parent 0c00a3941f
commit 40e800f1af
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/include/CGAL/config.h
View File

@ -46,7 +46,7 @@
// and other names leading to name clashes
#include <windows.h>
#endif
#include <windows.h>
#if defined(CGAL_TEST_SUITE) && defined(NDEBUG)
# error The test-suite needs no NDEBUG defined
#endif // CGAL_TEST_SUITE and NDEBUG

4
Shape_detection/include/CGAL/Shape_detection/Region_growing/Region_growing_on_point_set/Least_squares_circle_fit_region.h
View File

@ -200,7 +200,7 @@ namespace Point_set {
m_max_radius = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::maximum_radius),
FT(std::numeric_limits<double>::max()));
FT((std::numeric_limits<double>::max)()));
CGAL_precondition(m_max_radius >= m_min_radius);
}
@ -256,7 +256,7 @@ namespace Point_set {
const FT angle_threshold = FT(25),
const std::size_t min_region_size = 3,
const FT minimum_radius = FT(0),
const FT maximum_radius = FT(std::numeric_limits<double>::max()),
const FT maximum_radius = FT((std::numeric_limits<double>::max)()),
const PointMap point_map = PointMap(),
const NormalMap normal_map = NormalMap(),
const GeomTraits traits = GeomTraits()) :

4
Shape_detection/include/CGAL/Shape_detection/Region_growing/Region_growing_on_point_set/Least_squares_cylinder_fit_region.h
View File

@ -200,7 +200,7 @@ namespace Point_set {
m_max_radius = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::maximum_radius),
FT(std::numeric_limits<double>::max()));
FT((std::numeric_limits<double>::max)()));
CGAL_precondition(m_max_radius >= m_min_radius);
}
@ -256,7 +256,7 @@ namespace Point_set {
const FT angle_threshold = FT(25),
const std::size_t min_region_size = 3,
const FT minimum_radius = FT(0),
const FT maximum_radius = FT(std::numeric_limits<double>::max()),
const FT maximum_radius = FT((std::numeric_limits<double>::max)()),
const PointMap point_map = PointMap(),
const NormalMap normal_map = NormalMap(),
const GeomTraits traits = GeomTraits()) :

4
Shape_detection/include/CGAL/Shape_detection/Region_growing/Region_growing_on_point_set/Least_squares_sphere_fit_region.h
View File

@ -199,7 +199,7 @@ namespace Point_set {
m_max_radius = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::maximum_radius),
FT(std::numeric_limits<double>::max()));
FT((std::numeric_limits<double>::max)()));
CGAL_precondition(m_max_radius >= m_min_radius);
}
@ -255,7 +255,7 @@ namespace Point_set {
const FT angle_threshold = FT(25),
const std::size_t min_region_size = 3,
const FT minimum_radius = FT(0),
const FT maximum_radius = FT(std::numeric_limits<double>::max()),
const FT maximum_radius = FT((std::numeric_limits<double>::max)()),
const PointMap point_map = PointMap(),
const NormalMap normal_map = NormalMap(),
const GeomTraits traits = GeomTraits()) :

6
Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/utils.h
View File

@ -441,7 +441,7 @@ namespace internal {
if (eigenvectors[3] == IFT(0)) {
return std::make_pair(
std::make_pair(FT(-1), Point_2()),
static_cast<FT>(std::numeric_limits<double>::max()));
static_cast<FT>(((std::numeric_limits<double>::max))()));
}
CGAL_assertion(eigenvectors[3] != IFT(0));
@ -567,7 +567,7 @@ namespace internal {
if (eigenvectors[4] == IFT(0)) {
return std::make_pair(
std::make_pair(FT(-1), Point_3()),
static_cast<FT>(std::numeric_limits<double>::max()));
static_cast<FT>((std::numeric_limits<double>::max)()));
}
CGAL_assertion(eigenvectors[4] != IFT(0));
@ -677,7 +677,7 @@ namespace internal {
if (nb == 0) {
return std::make_pair(
std::make_pair(FT(-1), Line_3()),
static_cast<FT>(std::numeric_limits<double>::max()));
static_cast<FT>((std::numeric_limits<double>::max)()));
}
mean_axis = mean_axis / sqrt(mean_axis * mean_axis);