Merge pull request #1033 from Geode-solutions/fix/move-merger

fix(Merger): allow to move merger
Geode-solutions · Oct 22, 2024 · 8bcee66 · 8bcee66
2 parents 4ea7ce0 + 228ef99
commit 8bcee66
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 0 deletions.
diff --git a/include/geode/mesh/helpers/detail/curve_merger.hpp b/include/geode/mesh/helpers/detail/curve_merger.hpp
@@ -64,6 +64,7 @@ namespace geode
             EdgedCurveMerger( absl::Span< const std::reference_wrapper<
                                   const EdgedCurve< dimension > > > curves,
                 double epsilon );
+            EdgedCurveMerger( EdgedCurveMerger&& ) noexcept;
             ~EdgedCurveMerger();
 
             [[nodiscard]] std::unique_ptr< EdgedCurve< dimension > > merge();

diff --git a/include/geode/mesh/helpers/detail/point_set_merger.hpp b/include/geode/mesh/helpers/detail/point_set_merger.hpp
@@ -44,6 +44,7 @@ namespace geode
             PointSetMerger( absl::Span< const std::reference_wrapper<
                                 const PointSet< dimension > > > pointsets,
                 double epsilon );
+            PointSetMerger( PointSetMerger&& ) noexcept;
             ~PointSetMerger();
 
             [[nodiscard]] std::unique_ptr< PointSet< dimension > > merge();

diff --git a/include/geode/mesh/helpers/detail/solid_merger.hpp b/include/geode/mesh/helpers/detail/solid_merger.hpp
@@ -67,6 +67,7 @@ namespace geode
             SolidMeshMerger( absl::Span< const std::reference_wrapper<
                                  const SolidMesh< dimension > > > solids,
                 double epsilon );
+            SolidMeshMerger( SolidMeshMerger&& ) noexcept;
             ~SolidMeshMerger();
 
             [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge();

diff --git a/include/geode/mesh/helpers/detail/surface_merger.hpp b/include/geode/mesh/helpers/detail/surface_merger.hpp
@@ -66,6 +66,7 @@ namespace geode
             SurfaceMeshMerger( absl::Span< const std::reference_wrapper<
                                    const SurfaceMesh< dimension > > > surfaces,
                 double epsilon );
+            SurfaceMeshMerger( SurfaceMeshMerger&& ) noexcept;
             ~SurfaceMeshMerger();
 
             [[nodiscard]] std::unique_ptr< SurfaceMesh< dimension > > merge();

diff --git a/include/geode/mesh/helpers/detail/vertex_merger.hpp b/include/geode/mesh/helpers/detail/vertex_merger.hpp
@@ -60,6 +60,7 @@ namespace geode
             VertexMerger(
                 absl::Span< const std::reference_wrapper< const Mesh > > meshes,
                 double epsilon );
+            VertexMerger( VertexMerger&& ) noexcept;
             ~VertexMerger();
 
             [[nodiscard]] absl::Span<

diff --git a/src/geode/mesh/helpers/detail/curve_merger.cpp b/src/geode/mesh/helpers/detail/curve_merger.cpp
@@ -191,6 +191,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        EdgedCurveMerger< dimension >::EdgedCurveMerger(
+            EdgedCurveMerger&& ) noexcept = default;
+
         template < index_t dimension >
         EdgedCurveMerger< dimension >::~EdgedCurveMerger() = default;
 

diff --git a/src/geode/mesh/helpers/detail/point_set_merger.cpp b/src/geode/mesh/helpers/detail/point_set_merger.cpp
@@ -38,6 +38,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        PointSetMerger< dimension >::PointSetMerger(
+            PointSetMerger&& ) noexcept = default;
+
         template < index_t dimension >
         PointSetMerger< dimension >::~PointSetMerger() = default;
 

diff --git a/src/geode/mesh/helpers/detail/solid_merger.cpp b/src/geode/mesh/helpers/detail/solid_merger.cpp
@@ -322,6 +322,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        SolidMeshMerger< dimension >::SolidMeshMerger(
+            SolidMeshMerger&& ) noexcept = default;
+
         template < index_t dimension >
         SolidMeshMerger< dimension >::~SolidMeshMerger() = default;
 

diff --git a/src/geode/mesh/helpers/detail/surface_merger.cpp b/src/geode/mesh/helpers/detail/surface_merger.cpp
@@ -304,6 +304,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        SurfaceMeshMerger< dimension >::SurfaceMeshMerger(
+            SurfaceMeshMerger&& ) noexcept = default;
+
         template < index_t dimension >
         SurfaceMeshMerger< dimension >::~SurfaceMeshMerger() = default;
 

diff --git a/src/geode/mesh/helpers/detail/vertex_merger.cpp b/src/geode/mesh/helpers/detail/vertex_merger.cpp
@@ -167,6 +167,9 @@ namespace geode
         {
         }
 
+        template < typename Mesh >
+        VertexMerger< Mesh >::VertexMerger( VertexMerger&& ) noexcept = default;
+
         template < typename Mesh >
         VertexMerger< Mesh >::~VertexMerger() = default;