From 556764d6385109df857b2609845dcdd2d84583cc Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Fri, 22 Jan 2021 09:52:53 +0100 Subject: [PATCH 1/2] Add copy constructor to remove a warning (implicitly-declared is deprecated [-Wdeprecated-copy]) --- .../internal/Path_on_surface_with_rle.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h index a8e984fd348..398479cf176 100644 --- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h +++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h @@ -81,6 +81,8 @@ public: Light_MQ(const Local_map& m): m_map(m) {} + Light_MQ(const Light_MQ& lmq): m_map(lmq.m_map) + {} const Local_map& get_local_map() const { return m_map; } @@ -141,6 +143,17 @@ public: #endif //CGAL_PWRLE_TURN_V2 {} + Path_on_surface_with_rle(const Self& apath): m_MQ(apath.m_MQ), + m_path(apath.m_path), + m_is_closed(apath.m_is_closed), + m_length(apath.m_length), + m_use_only_positive(apath.m_use_only_positive), + m_use_only_negative(apath.m_use_only_negative) +#ifdef CGAL_PWRLE_TURN_V2 + , m_darts_ids(apath.m_darts_ids) +#endif //CGAL_PWRLE_TURN_V2 + {} + /// Creates a Path_on_surface_with_rle from a Path_on_surface. /// If use_only_positive, consider only positive flats and not negative ones. /// If use_only_negative, consider only negative flats and not positive ones. From 15a323e3fa6c3813e8f09a5f1e5229fea599dcfa Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Fri, 22 Jan 2021 17:48:08 +0100 Subject: [PATCH 2/2] Use default for copy constructors --- .../internal/Path_on_surface_with_rle.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h index 398479cf176..6b2ad7c3495 100644 --- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h +++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h @@ -81,8 +81,7 @@ public: Light_MQ(const Local_map& m): m_map(m) {} - Light_MQ(const Light_MQ& lmq): m_map(lmq.m_map) - {} + Light_MQ(const Light_MQ&) = default; const Local_map& get_local_map() const { return m_map; } @@ -143,16 +142,7 @@ public: #endif //CGAL_PWRLE_TURN_V2 {} - Path_on_surface_with_rle(const Self& apath): m_MQ(apath.m_MQ), - m_path(apath.m_path), - m_is_closed(apath.m_is_closed), - m_length(apath.m_length), - m_use_only_positive(apath.m_use_only_positive), - m_use_only_negative(apath.m_use_only_negative) -#ifdef CGAL_PWRLE_TURN_V2 - , m_darts_ids(apath.m_darts_ids) -#endif //CGAL_PWRLE_TURN_V2 - {} + Path_on_surface_with_rle(const Self&) = default; /// Creates a Path_on_surface_with_rle from a Path_on_surface. /// If use_only_positive, consider only positive flats and not negative ones.