diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h index d817e2a5007..e1e6ae46326 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h @@ -39,7 +39,8 @@ namespace CGAL { template class Conforming_Delaunay_triangulation_3 : public T_3 { public: - static constexpr bool t_3_is_not_movable = CGAL::cdt_3_msvc_2017() || false == CGAL::is_nothrow_movable_v; + static constexpr bool t_3_is_not_movable = + CGAL::cdt_3_msvc_2019_or_older() || false == CGAL::is_nothrow_movable_v; using Geom_traits = typename T_3::Geom_traits; using Vertex_handle = typename T_3::Vertex_handle; using Edge = typename T_3::Edge; @@ -931,7 +932,7 @@ protected: Compare_vertex_handle comp = {this}; Constraint_hierarchy constraint_hierarchy = {comp}; - static_assert(CGAL::cdt_3_msvc_2017() || CGAL::is_nothrow_movable_v); + static_assert(CGAL::cdt_3_msvc_2019_or_older() || CGAL::is_nothrow_movable_v); Bbox_3 bbox{}; double segment_vertex_epsilon = 1e-8; std::optional max_bbox_edge_length; diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h index 28fdf21f010..8fb41d6296f 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h @@ -904,7 +904,7 @@ public: } } Conforming_constrained_Delaunay_triangulation_3 result{std::move(*this)}; - static_assert(CGAL::cdt_3_msvc_2017() || + static_assert(CGAL::cdt_3_msvc_2019_or_older() || CGAL::is_nothrow_movable_v == false || CGAL::is_nothrow_movable_v); static_assert(std::is_same_v, Conforming_constrained_Delaunay_triangulation_3>); @@ -1123,7 +1123,7 @@ private: using CDT_2_traits = typename CDT_2_types::Projection_traits; using CDT_2_face_handle = typename CDT_2::Face_handle; using CDT_2_edge = typename CDT_2::Edge; - static_assert(CGAL::cdt_3_msvc_2017() || CGAL::is_nothrow_movable_v); + static_assert(CGAL::cdt_3_msvc_2019_or_older() || CGAL::is_nothrow_movable_v); protected: struct PLC_error : Error_exception { diff --git a/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/config.h b/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/config.h index 4e58df3802c..99c39f2555b 100644 --- a/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/config.h +++ b/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/config.h @@ -25,8 +25,8 @@ namespace CGAL { -constexpr bool cdt_3_msvc_2017() { -#if defined(_MSC_VER) && (_MSC_VER < 1920) +constexpr bool cdt_3_msvc_2019_or_older() { +#if defined(_MSC_VER) && (_MSC_VER < 1930) return true; #else return false;