Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug fix: definition of Self and Base in class Cell_attribute_with_point when using index. #8257

Merged
merged 4 commits into from
Jun 10, 2024
Merged

Bug fix: definition of Self and Base in class Cell_attribute_with_point when using index. #8257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0c768b
Bug fix: definition of Self and Base in class Cell_attribute_with_poi…
gdamiand Jun 5, 2024
31f5aa5
add missing friend
gdamiand Jun 5, 2024
d3e88f2
Use different number types for lcc with index in tests.
gdamiand Jun 5, 2024
e4140c2
Change type in storage with index (cmap, gmap, lcc)
gdamiand Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Generalized_map/include/CGAL/Generalized_map_storages_with_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions Linear_cell_complex/include/CGAL/Cell_attribute_with_point_and_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,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
Expand Down
1 change: 1 addition & 0 deletions Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_3_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,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
Expand Down
1 change: 1 addition & 0 deletions Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_4_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,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
Expand Down
Loading