From 80bc1eafce6c91edeeab93fae0c0e13c3fceea04 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Wed, 13 Apr 2022 20:28:43 +0200 Subject: [PATCH] Bugfix in gmap with index --- .../include/CGAL/Generalized_map.h | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h index 4e148fea569..d6c92c5ec3c 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -232,7 +232,7 @@ namespace CGAL { // (here we cannot use CGAL::Unique_hash_map because it does not provide // iterators... std::unordered_map local_dartmap; - if (origin_to_copy==NULL) // Use local_dartmap if user does not provides its own unordered_map + if (origin_to_copy==nullptr) // Use local_dartmap if user does not provides its own unordered_map { origin_to_copy=&local_dartmap; } Dart_handle new_dart; @@ -667,7 +667,7 @@ namespace CGAL { } /** Return a dart belonging to the same edge and to the second vertex - * of the current edge (nullptr if such a dart does not exist). + * of the current edge (null_handle if such a dart does not exist). * @return An handle to a dart belonging to the other extremity. */ Dart_handle other_extremity(Dart_handle dh) @@ -1576,10 +1576,10 @@ namespace CGAL { dart_link_alpha(dart2, dart1, i); } - /** Double link two darts, and update the nullptr attributes. + /** Double link two darts, and update the null_handle attributes. * \em adart1 is i-linked to \em adart2 and \em adart2 is i-linked - * with \em adart1. The nullptr attributes of \em adart1 are updated to - * non nullptr attributes associated to \em adart2, and vice-versa. + * with \em adart1. The null_handle attributes of \em adart1 are updated to + * non null_handle attributes associated to \em adart2, and vice-versa. * If both darts have an attribute, the attribute of adart1 is * associated to adart2. * We can obtain a non-valid map with darts belonging to a same cell @@ -1602,8 +1602,8 @@ namespace CGAL { /** Double link a dart with alphai to a second dart. * \em adart1 is i-linked to \em adart2 and \em adart2 is i^-1-linked - * with \em adart1. The nullptr attributes of \em adart1 are updated to - * non nullptr attributes associated to \em adart2, and vice-versa, + * with \em adart1. The null_handle attributes of \em adart1 are updated to + * non null_handle attributes associated to \em adart2, and vice-versa, * if both darts have an attribute, the attribute of adart1 is * associated to adart2 (only if update_attributes==true). * @param adart1 a first dart. @@ -2477,8 +2477,8 @@ namespace CGAL { /** Compute the dual of a Generalized_map. * @param amap the gmap in which we build the dual of this map. - * @param adart a dart of the initial map, nullptr by default. - * @return adart of the dual map, the dual of adart if adart!=nullptr, + * @param adart a dart of the initial map, null_handle by default. + * @return adart of the dual map, the dual of adart if adart!=null_handle, * any dart otherwise. * As soon as we don't modify this map and amap map, we can iterate * simultaneously through all the darts of the two maps and we have @@ -3298,7 +3298,7 @@ namespace CGAL { } /** Insert a vertex in a given edge. - * @param adart a dart of the edge (!=nullptr). + * @param adart a dart of the edge (!=null_handle). * @return a dart of the new vertex. */ Dart_handle insert_cell_0_in_cell_1( Dart_handle adart, @@ -3523,8 +3523,8 @@ namespace CGAL { } /** Insert an edge in a 2-cell between two given darts. - * @param adart1 a first dart of the facet (!=nullptr && !=null_dart_handle). - * @param adart2 a second dart of the facet. If nullptr insert a dangling edge. + * @param adart1 a first dart of the facet (!=null_handle && !=null_dart_handle). + * @param adart2 a second dart of the facet. If null_handle insert a dangling edge. * @return a dart of the new edge, and not incident to the * same vertex than adart1. */ @@ -3665,7 +3665,7 @@ namespace CGAL { } /** Insert a dangling edge in a 2-cell between given by a dart. - * @param adart1 a first dart of the facet (!=nullptr && !=null_dart_handle). + * @param adart1 a first dart of the facet (!=null_handle && !=null_dart_handle). * @param update_attributes a boolean to update the enabled attributes * @return a dart of the new edge, not incident to the vertex of adart1. */ @@ -3673,7 +3673,7 @@ namespace CGAL { typename Attribute_handle<0>:: type ah=null_handle, bool update_attributes=true ) - { return insert_cell_1_in_cell_2(adart1, nullptr, update_attributes, ah); } + { return insert_cell_1_in_cell_2(adart1, null_handle, update_attributes, ah); } /** Test if a 2-cell can be inserted onto a given 3-cell along * a path of edges. @@ -3795,7 +3795,7 @@ namespace CGAL { basic_link_alpha<2>(alpha<0>(oldb2), alpha<0>(dd)); } else - oldb2=nullptr; + oldb2=null_handle; basic_link_alpha<2>(*it, d); basic_link_alpha<2>(alpha<0>(*it), alpha<0>(d));