diff --git a/Orthtree/examples/Orthtree/octree_grade.cpp b/Orthtree/examples/Orthtree/octree_grade.cpp index 5bb410d7e33..5f213ff1233 100644 --- a/Orthtree/examples/Orthtree/octree_grade.cpp +++ b/Orthtree/examples/Orthtree/octree_grade.cpp @@ -14,8 +14,6 @@ int main() { // Here, our point set is a vector Point_vector points; - using IPoint = CGAL::Simple_cartesian::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); diff --git a/Orthtree/examples/Orthtree/quadtree_build_manually.cpp b/Orthtree/examples/Orthtree/quadtree_build_manually.cpp index 73808cc603b..708b680213b 100644 --- a/Orthtree/examples/Orthtree/quadtree_build_manually.cpp +++ b/Orthtree/examples/Orthtree/quadtree_build_manually.cpp @@ -30,7 +30,7 @@ struct Orthtree_traits_empty : public Orthtree_traits_base_for_dimension 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: diff --git a/Orthtree/include/CGAL/Orthtree.h b/Orthtree/include/CGAL/Orthtree.h index 563e6c94850..d1eac256ea3 100644 --- a/Orthtree/include/CGAL/Orthtree.h +++ b/Orthtree/include/CGAL/Orthtree.h @@ -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("contents")), m_node_depths(m_node_properties.get_property("depths")), m_node_coordinates(m_node_properties.get_property("coordinates")), m_node_parents(m_node_properties.get_property("parents")), - m_node_children(m_node_properties.get_property("children")) {} + m_node_children(m_node_properties.get_property("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("contents")), m_node_depths(m_node_properties.get_property("depths")), m_node_coordinates(m_node_properties.get_property("coordinates")), m_node_parents(m_node_properties.get_property("parents")), - m_node_children(m_node_properties.get_property("children")) { - + m_node_children(m_node_properties.get_property("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(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); diff --git a/Orthtree/include/CGAL/Orthtree_traits_face_graph.h b/Orthtree/include/CGAL/Orthtree_traits_face_graph.h index a99fcc898bc..d7e28bbbdc8 100644 --- a/Orthtree/include/CGAL/Orthtree_traits_face_graph.h +++ b/Orthtree/include/CGAL/Orthtree_traits_face_graph.h @@ -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) {