Skip to content

Commit 8bcee66

Browse files
Merge pull request #1033 from Geode-solutions/fix/move-merger
fix(Merger): allow to move merger
2 parents 4ea7ce0 + 228ef99 commit 8bcee66

File tree

10 files changed

+24
-0
lines changed

10 files changed

+24
-0
lines changed

include/geode/mesh/helpers/detail/curve_merger.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ namespace geode
6464
EdgedCurveMerger( absl::Span< const std::reference_wrapper<
6565
const EdgedCurve< dimension > > > curves,
6666
double epsilon );
67+
EdgedCurveMerger( EdgedCurveMerger&& ) noexcept;
6768
~EdgedCurveMerger();
6869

6970
[[nodiscard]] std::unique_ptr< EdgedCurve< dimension > > merge();

include/geode/mesh/helpers/detail/point_set_merger.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ namespace geode
4444
PointSetMerger( absl::Span< const std::reference_wrapper<
4545
const PointSet< dimension > > > pointsets,
4646
double epsilon );
47+
PointSetMerger( PointSetMerger&& ) noexcept;
4748
~PointSetMerger();
4849

4950
[[nodiscard]] std::unique_ptr< PointSet< dimension > > merge();

include/geode/mesh/helpers/detail/solid_merger.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ namespace geode
6767
SolidMeshMerger( absl::Span< const std::reference_wrapper<
6868
const SolidMesh< dimension > > > solids,
6969
double epsilon );
70+
SolidMeshMerger( SolidMeshMerger&& ) noexcept;
7071
~SolidMeshMerger();
7172

7273
[[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge();

include/geode/mesh/helpers/detail/surface_merger.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ namespace geode
6666
SurfaceMeshMerger( absl::Span< const std::reference_wrapper<
6767
const SurfaceMesh< dimension > > > surfaces,
6868
double epsilon );
69+
SurfaceMeshMerger( SurfaceMeshMerger&& ) noexcept;
6970
~SurfaceMeshMerger();
7071

7172
[[nodiscard]] std::unique_ptr< SurfaceMesh< dimension > > merge();

include/geode/mesh/helpers/detail/vertex_merger.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ namespace geode
6060
VertexMerger(
6161
absl::Span< const std::reference_wrapper< const Mesh > > meshes,
6262
double epsilon );
63+
VertexMerger( VertexMerger&& ) noexcept;
6364
~VertexMerger();
6465

6566
[[nodiscard]] absl::Span<

src/geode/mesh/helpers/detail/curve_merger.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ namespace geode
191191
{
192192
}
193193

194+
template < index_t dimension >
195+
EdgedCurveMerger< dimension >::EdgedCurveMerger(
196+
EdgedCurveMerger&& ) noexcept = default;
197+
194198
template < index_t dimension >
195199
EdgedCurveMerger< dimension >::~EdgedCurveMerger() = default;
196200

src/geode/mesh/helpers/detail/point_set_merger.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ namespace geode
3838
{
3939
}
4040

41+
template < index_t dimension >
42+
PointSetMerger< dimension >::PointSetMerger(
43+
PointSetMerger&& ) noexcept = default;
44+
4145
template < index_t dimension >
4246
PointSetMerger< dimension >::~PointSetMerger() = default;
4347

src/geode/mesh/helpers/detail/solid_merger.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,10 @@ namespace geode
322322
{
323323
}
324324

325+
template < index_t dimension >
326+
SolidMeshMerger< dimension >::SolidMeshMerger(
327+
SolidMeshMerger&& ) noexcept = default;
328+
325329
template < index_t dimension >
326330
SolidMeshMerger< dimension >::~SolidMeshMerger() = default;
327331

src/geode/mesh/helpers/detail/surface_merger.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,10 @@ namespace geode
304304
{
305305
}
306306

307+
template < index_t dimension >
308+
SurfaceMeshMerger< dimension >::SurfaceMeshMerger(
309+
SurfaceMeshMerger&& ) noexcept = default;
310+
307311
template < index_t dimension >
308312
SurfaceMeshMerger< dimension >::~SurfaceMeshMerger() = default;
309313

src/geode/mesh/helpers/detail/vertex_merger.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ namespace geode
167167
{
168168
}
169169

170+
template < typename Mesh >
171+
VertexMerger< Mesh >::VertexMerger( VertexMerger&& ) noexcept = default;
172+
170173
template < typename Mesh >
171174
VertexMerger< Mesh >::~VertexMerger() = default;
172175

0 commit comments

Comments
 (0)