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

fix warnings

This commit is contained in:
Sébastien Loriot 2024-01-24 11:47:11 +01:00
parent 33e09bf1a0
commit d078a34e1f
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Orthtree/examples/Orthtree/octree_grade.cpp
View File

@ -14,8 +14,6 @@ int main() {
// Here, our point set is a vector
Point_vector points;
using IPoint = CGAL::Simple_cartesian<int>::Point_3;
// Add a few points to the vector, most of which are in one region
points.emplace_back(1, 1, 1);
points.emplace_back(2, 1, -11);

2
Orthtree/examples/Orthtree/quadtree_build_manually.cpp
View File

@ -30,7 +30,7 @@ struct Orthtree_traits_empty : public Orthtree_traits_base_for_dimension<K, Dime
auto construct_root_node_contents_object() const { return [&]() -> Node_data { return {}; }; }
auto distribute_node_contents_object() {
return [&](typename Tree::Node_index n, Tree& tree, const typename Self::Point_d& center) -> void {};
return [&](typename Tree::Node_index /* n */, Tree& /* tree */, const typename Self::Point_d& /* center */) -> void {};
}
private:

14
Orthtree/include/CGAL/Orthtree.h
View File

@ -232,30 +232,28 @@ public:
/// @}
/// \cond SKIP_IN_MANUAL
// copy constructor
Orthtree(const Orthtree& other) :
m_traits(other.m_traits),
m_bbox_min(other.m_bbox_min), m_side_per_depth(other.m_side_per_depth),
m_node_properties(other.m_node_properties),
m_node_contents(m_node_properties.get_property<Node_data>("contents")),
m_node_depths(m_node_properties.get_property<std::uint8_t>("depths")),
m_node_coordinates(m_node_properties.get_property<Global_coordinates>("coordinates")),
m_node_parents(m_node_properties.get_property<Maybe_node_index>("parents")),
m_node_children(m_node_properties.get_property<Maybe_node_index>("children")) {}
m_node_children(m_node_properties.get_property<Maybe_node_index>("children")),
m_bbox_min(other.m_bbox_min), m_side_per_depth(other.m_side_per_depth) {}
// move constructor
Orthtree(Orthtree&& other) :
m_traits(other.m_traits),
m_bbox_min(other.m_bbox_min), m_side_per_depth(other.m_side_per_depth),
m_node_properties(std::move(other.m_node_properties)),
m_node_contents(m_node_properties.get_property<Node_data>("contents")),
m_node_depths(m_node_properties.get_property<std::uint8_t>("depths")),
m_node_coordinates(m_node_properties.get_property<Global_coordinates>("coordinates")),
m_node_parents(m_node_properties.get_property<Maybe_node_index>("parents")),
m_node_children(m_node_properties.get_property<Maybe_node_index>("children")) {
m_node_children(m_node_properties.get_property<Maybe_node_index>("children")),
m_bbox_min(other.m_bbox_min), m_side_per_depth(other.m_side_per_depth)
{
// todo: makes sure moved-from is still valid. Maybe this shouldn't be necessary.
other.m_node_properties.emplace();
}
@ -1245,7 +1243,7 @@ public:
// Iterate over all nodes
for (auto n: orthtree.traverse(Orthtrees::Preorder_traversal<Self>(orthtree))) {
// Show the depth
for (int i = 0; i < orthtree.depth(n); ++i)
for (std::size_t i = 0; i < orthtree.depth(n); ++i)
os << ". ";
// Print the node
internal::print_orthtree_node(os, n, orthtree);

2
Orthtree/include/CGAL/Orthtree_traits_face_graph.h
View File

@ -106,7 +106,7 @@ struct Orthtree_traits_face_graph : public Orthtree_traits_base_for_dimension<
}
auto distribute_node_contents_object() {
return [&](Node_index n, Tree& tree, const Point_d& center) -> void {
return [&](Node_index n, Tree& tree, const Point_d& /* center */) -> void {
Node_data& ndata = tree.data(n);
auto traits = tree.traits();
for (int i = 0; i < 8; ++i) {