Merge pull request CGAL#8257 from gdamiand/LCC-bugfix-gdamiand

Bug fix: definition of Self and Base in class Cell_attribute_with_point when using index.
lrineau · Jun 5, 2024 · 67d4e4a · 67d4e4a
2 parents c36ede0 + e4140c2
commit 67d4e4a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 6 deletions.
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h b/Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h
@@ -75,7 +75,7 @@ namespace CGAL {
  struct Container_for_attributes : public
  Compact_container_with_index<T,
  typename Allocator_traits::template rebind_alloc<T>,
- Multiply_by_two_policy_for_cc_with_size<64>, size_type >
+ Multiply_by_two_policy_for_cc_with_size<64>, Index_type >
  {};
  /// Typedef for attributes
  typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

diff --git a/Generalized_map/include/CGAL/Generalized_map_storages_with_index.h b/Generalized_map/include/CGAL/Generalized_map_storages_with_index.h
@@ -75,7 +75,7 @@ namespace CGAL {
  struct Container_for_attributes : public
  Compact_container_with_index<T,
  typename Allocator_traits::template rebind_alloc<T>,
- Multiply_by_two_policy_for_cc_with_size<64>, size_type >
+ Multiply_by_two_policy_for_cc_with_size<64>, Index_type >
  {};
  /// Typedef for attributes
  typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

diff --git a/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h b/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h
@@ -85,7 +85,7 @@ namespace CGAL {
  struct Container_for_attributes : public
  Compact_container_with_index<T,
  typename Allocator_traits::template rebind_alloc<T>,
- Multiply_by_two_policy_for_cc_with_size<64>, size_type >
+ Multiply_by_two_policy_for_cc_with_size<64>, Index_type >
  {};
  /// Typedef for attributes
  typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

diff --git a/Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h b/Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
@@ -91,10 +91,10 @@ namespace CGAL {
 
  public:
  typedef Cell_attribute_with_point<LCC, Info_, Tag, Functor_on_merge_,
- Functor_on_split_> Self;
+ Functor_on_split_, WithID> Self;
 
  typedef Cell_attribute<LCC, Info_, Tag,
- Functor_on_merge_, Functor_on_split_> Base1;
+ Functor_on_merge_, Functor_on_split_, WithID> Base1;
  typedef Point_for_cell<typename LCC::Point> Base2;
 
  typedef typename LCC::Point Point;

diff --git a/Linear_cell_complex/include/CGAL/Cell_attribute_with_point_and_id.h b/Linear_cell_complex/include/CGAL/Cell_attribute_with_point_and_id.h
@@ -32,6 +32,9 @@ namespace CGAL {
  template <class, class>
  friend class Concurrent_compact_container;
 
+ template <class, class, class, class>
+ friend class Compact_container_with_index;
+
  public:
  typedef typename Base::Point Point;
 
@@ -64,6 +67,9 @@ namespace CGAL {
  template <class, class>
  friend class Concurrent_compact_container;
 
+ template <class, class, class, class>
+ friend class Compact_container_with_index;
+
  public:
  typedef typename Base::Point Point;
 

diff --git a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h
@@ -85,7 +85,7 @@ namespace CGAL {
  struct Container_for_attributes : public
  Compact_container_with_index<T,
  typename Allocator_traits::template rebind_alloc<T>,
- Multiply_by_two_policy_for_cc_with_size<64>, size_type >
+ Multiply_by_two_policy_for_cc_with_size<64>, Index_type >
  {};
  /// Typedef for attributes
  typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

diff --git a/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.cpp b/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.cpp
@@ -55,6 +55,7 @@ struct Myitems_2b
 {
 #ifdef USE_COMPACT_CONTAINER_WITH_INDEX
  typedef CGAL::Tag_true Use_index;
+ using Index_type=std::uint16_t;
 #endif
  template <class LCC>
  struct Dart_wrapper

diff --git a/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_3_test.cpp b/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_3_test.cpp
@@ -61,6 +61,7 @@ struct Myitems_3b
 {
 #ifdef USE_COMPACT_CONTAINER_WITH_INDEX
  typedef CGAL::Tag_true Use_index;
+ using Index_type=std::uint32_t;
 #endif
  template <class LCC>
  struct Dart_wrapper

diff --git a/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_4_test.cpp b/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_4_test.cpp
@@ -58,6 +58,7 @@ struct Myitems_4b
 {
 #ifdef USE_COMPACT_CONTAINER_WITH_INDEX
  typedef CGAL::Tag_true Use_index;
+ using Index_type=std::uint64_t;
 #endif
  template <class LCC>
  struct Dart_wrapper