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

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

Bug fix: definition of Self and Base in class Cell_attribute_with_point when using index.
This commit is contained in:
Laurent Rineau 2024-06-10 18:28:30 +02:00
parent 94b9726a46 e4140c286f
commit 4ba26e9280
9 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h
View File

@ -75,7 +75,7 @@ namespace CGAL {
struct Container_for_attributes : public struct Container_for_attributes : public
Compact_container_with_index<T, Compact_container_with_index<T,
typename Allocator_traits::template rebind_alloc<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 for attributes
typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

2
Generalized_map/include/CGAL/Generalized_map_storages_with_index.h
View File

@ -75,7 +75,7 @@ namespace CGAL {
struct Container_for_attributes : public struct Container_for_attributes : public
Compact_container_with_index<T, Compact_container_with_index<T,
typename Allocator_traits::template rebind_alloc<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 for attributes
typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

2
Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h
View File

@ -85,7 +85,7 @@ namespace CGAL {
struct Container_for_attributes : public struct Container_for_attributes : public
Compact_container_with_index<T, Compact_container_with_index<T,
typename Allocator_traits::template rebind_alloc<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 for attributes
typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

4
Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
View File

@ -91,10 +91,10 @@ namespace CGAL {
public: public:
typedef Cell_attribute_with_point<LCC, Info_, Tag, Functor_on_merge_, 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, 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 Point_for_cell<typename LCC::Point> Base2;
typedef typename LCC::Point Point; typedef typename LCC::Point Point;

6
Linear_cell_complex/include/CGAL/Cell_attribute_with_point_and_id.h
View File

@ -32,6 +32,9 @@ namespace CGAL {
template <class, class> template <class, class>
friend class Concurrent_compact_container; friend class Concurrent_compact_container;
template <class, class, class, class>
friend class Compact_container_with_index;
public: public:
typedef typename Base::Point Point; typedef typename Base::Point Point;
@ -64,6 +67,9 @@ namespace CGAL {
template <class, class> template <class, class>
friend class Concurrent_compact_container; friend class Concurrent_compact_container;
template <class, class, class, class>
friend class Compact_container_with_index;
public: public:
typedef typename Base::Point Point; typedef typename Base::Point Point;

2
Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h
View File

@ -85,7 +85,7 @@ namespace CGAL {
struct Container_for_attributes : public struct Container_for_attributes : public
Compact_container_with_index<T, Compact_container_with_index<T,
typename Allocator_traits::template rebind_alloc<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 for attributes
typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type

1
Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.cpp
View File

@ -54,6 +54,7 @@ struct Myitems_2b
{ {
#ifdef USE_COMPACT_CONTAINER_WITH_INDEX #ifdef USE_COMPACT_CONTAINER_WITH_INDEX
typedef CGAL::Tag_true Use_index; typedef CGAL::Tag_true Use_index;
using Index_type=std::uint16_t;
#endif #endif
template <class LCC> template <class LCC>
struct Dart_wrapper struct Dart_wrapper

1
Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_3_test.cpp
View File

@ -60,6 +60,7 @@ struct Myitems_3b
{ {
#ifdef USE_COMPACT_CONTAINER_WITH_INDEX #ifdef USE_COMPACT_CONTAINER_WITH_INDEX
typedef CGAL::Tag_true Use_index; typedef CGAL::Tag_true Use_index;
using Index_type=std::uint32_t;
#endif #endif
template <class LCC> template <class LCC>
struct Dart_wrapper struct Dart_wrapper

1
Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_4_test.cpp
View File

@ -57,6 +57,7 @@ struct Myitems_4b
{ {
#ifdef USE_COMPACT_CONTAINER_WITH_INDEX #ifdef USE_COMPACT_CONTAINER_WITH_INDEX
typedef CGAL::Tag_true Use_index; typedef CGAL::Tag_true Use_index;
using Index_type=std::uint64_t;
#endif #endif
template <class LCC> template <class LCC>
struct Dart_wrapper struct Dart_wrapper