phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7416 from sloriot/CGAL-toward_6.0

Browse Source 
CGAL 6.0 requires c++17
This commit is contained in:
Sébastien Loriot
2023-06-22 09:28:15 +02:00
parent 4673df281a 6abf126e10
commit cce3dfd075
237 changed files with 813 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Point_set_processing_3/include/CGAL/OpenGR/compute_registration_transformation.h
+4 -4
View File
@@ -309,14 +309,14 @@ compute_registration_transformation (const PointRange1& point_set_1, const Point
typedef Point_set_processing_3_np_helper<PointRange2, NamedParameters2> NP_helper2;
typedef typename NP_helper1::Const_point_map PointMap1;
typedef typename NP_helper2::Const_point_map PointMap2;
CGAL_static_assertion_msg((std::is_same< typename boost::property_traits<PointMap1>::value_type,
typename boost::property_traits<PointMap2>::value_type> ::value),
static_assert(std::is_same< typename boost::property_traits<PointMap1>::value_type,
typename boost::property_traits<PointMap2>::value_type> ::value,
"The point type of input ranges must be the same");
typedef typename NP_helper1::Normal_map NormalMap1;
typedef typename NP_helper2::Normal_map NormalMap2;
CGAL_static_assertion_msg((std::is_same< typename boost::property_traits<NormalMap1>::value_type,
typename boost::property_traits<NormalMap2>::value_type> ::value),
static_assert(std::is_same< typename boost::property_traits<NormalMap1>::value_type,
typename boost::property_traits<NormalMap2>::value_type> ::value,
"The vector type of input ranges must be the same");
typedef typename NP_helper1::Geom_traits Kernel;
Point_set_processing_3/include/CGAL/OpenGR/register_point_sets.h
+4 -4
View File
@@ -222,14 +222,14 @@ register_point_sets (const PointRange1& point_set_1, PointRange2& point_set_2,
typedef Point_set_processing_3_np_helper<PointRange2, NamedParameters2> NP_helper2;
typedef typename NP_helper1::Const_point_map PointMap1;
typedef typename NP_helper2::Const_point_map PointMap2;
CGAL_static_assertion_msg((std::is_same< typename boost::property_traits<PointMap1>::value_type,
typename boost::property_traits<PointMap2>::value_type> ::value),
static_assert(std::is_same< typename boost::property_traits<PointMap1>::value_type,
typename boost::property_traits<PointMap2>::value_type> ::value,
"The point type of input ranges must be the same");
typedef typename NP_helper1::Normal_map NormalMap1;
typedef typename NP_helper2::Normal_map NormalMap2;
CGAL_static_assertion_msg((std::is_same< typename boost::property_traits<NormalMap1>::value_type,
typename boost::property_traits<NormalMap2>::value_type> ::value),
static_assert(std::is_same< typename boost::property_traits<NormalMap1>::value_type,
typename boost::property_traits<NormalMap2>::value_type> ::value,
"The vector type of input ranges must be the same");
typedef typename NP_helper1::Geom_traits Kernel;
Point_set_processing_3/include/CGAL/cluster_point_set.h
+1 -1
View File
@@ -145,7 +145,7 @@ std::size_t cluster_point_set (PointRange& points,
typedef typename NP_helper::Geom_traits Kernel;
typedef typename Point_set_processing_3::GetAdjacencies<PointRange, NamedParameters>::type Adjacencies;
CGAL_static_assertion_msg(!(std::is_same<typename GetSvdTraits<NamedParameters>::type,
static_assert(!(std::is_same<typename GetSvdTraits<NamedParameters>::type,
typename GetSvdTraits<NamedParameters>::NoTraits>::value),
"Error: no SVD traits");
Point_set_processing_3/include/CGAL/jet_estimate_normals.h
+1 -1
View File
@@ -197,7 +197,7 @@ jet_estimate_normals(
typedef typename GetSvdTraits<NamedParameters>::type SvdTraits;
CGAL_assertion_msg(NP_helper::has_normal_map(points, np), "Error: no normal map");
CGAL_static_assertion_msg(!(std::is_same<SvdTraits,
static_assert(!(std::is_same<SvdTraits,
typename GetSvdTraits<NamedParameters>::NoTraits>::value),
"Error: no SVD traits");
Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
+1 -1
View File
@@ -200,7 +200,7 @@ jet_smooth_point_set(
typedef typename NP_helper::Geom_traits Kernel;
typedef typename GetSvdTraits<NamedParameters>::type SvdTraits;
CGAL_static_assertion_msg(!(std::is_same<SvdTraits,
static_assert(!(std::is_same<SvdTraits,
typename GetSvdTraits<NamedParameters>::NoTraits>::value),
"Error: no SVD traits");
Point_set_processing_3/include/CGAL/pointmatcher/compute_registration_transformation.h
+6 -6
View File
@@ -607,14 +607,14 @@ compute_registration_transformation (const PointRange1& point_set_1, const Point
// property map types
typedef typename NP_helper1::Const_point_map PointMap1;
typedef typename NP_helper2::Const_point_map PointMap2;
CGAL_static_assertion_msg((std::is_same< typename boost::property_traits<PointMap1>::value_type,
typename boost::property_traits<PointMap2>::value_type> ::value),
static_assert(std::is_same< typename boost::property_traits<PointMap1>::value_type,
typename boost::property_traits<PointMap2>::value_type> ::value,
"The point type of input ranges must be the same");
typedef typename NP_helper1::Normal_map NormalMap1;
typedef typename NP_helper2::Normal_map NormalMap2;
CGAL_static_assertion_msg((std::is_same< typename boost::property_traits<NormalMap1>::value_type,
typename boost::property_traits<NormalMap2>::value_type> ::value),
static_assert(std::is_same< typename boost::property_traits<NormalMap1>::value_type,
typename boost::property_traits<NormalMap2>::value_type> ::value,
"The vector type of input ranges must be the same");
typedef typename std::iterator_traits<typename PointRange1::iterator>::value_type key_type1;
@@ -630,8 +630,8 @@ compute_registration_transformation (const PointRange1& point_set_1, const Point
NormalMap2 normal_map2 = NP_helper2::get_normal_map(point_set_2, np2);
auto weight_map2 = choose_parameter(get_parameter(np2, internal_np::scalar_map), DefaultWeightMap2(Scalar(1)));
CGAL_static_assertion_msg((std::is_same< typename boost::property_traits<decltype(weight_map1)>::value_type,
typename boost::property_traits<decltype(weight_map2)>::value_type> ::value),
static_assert(std::is_same< typename boost::property_traits<decltype(weight_map1)>::value_type,
typename boost::property_traits<decltype(weight_map2)>::value_type> ::value,
"The scalar type of input ranges must be the same");
// initial transformation
Point_set_processing_3/include/CGAL/structure_point_set.h
+1 -1
View File
@@ -234,7 +234,7 @@ public:
typedef typename Point_set_processing_3::GetPlaneIndexMap<NamedParameters>::type PlaneIndexMap;
CGAL_assertion_msg(NP_helper::has_normal_map(points, np), "Error: no normal map");
CGAL_static_assertion_msg((!is_default_parameter<NamedParameters, internal_np::plane_index_t>::value),
static_assert(!is_default_parameter<NamedParameters, internal_np::plane_index_t>::value,
"Error: no plane index map");
PointMap point_map = NP_helper::get_const_point_map(points, np);