Don't use the new methods on perl side (avoid test failure in tmf)

This commit is contained in:
Joseph Lenox 2018-07-13 19:41:44 -05:00
parent 3f3de067f8
commit 2f8c88cb96
2 changed files with 4 additions and 1 deletions

View File

@ -108,6 +108,7 @@ void TriangleMesh::clone(const TriangleMesh& other) {
} }
} }
#ifndef SLIC3RXS
TriangleMesh::TriangleMesh(TriangleMesh&& other) { TriangleMesh::TriangleMesh(TriangleMesh&& other) {
this->repaired = std::move(other.repaired); this->repaired = std::move(other.repaired);
this->stl = std::move(other.stl); this->stl = std::move(other.stl);
@ -120,6 +121,7 @@ TriangleMesh& TriangleMesh::operator= (TriangleMesh&& other)
return *this; return *this;
} }
#endif
void void
TriangleMesh::swap(TriangleMesh &other) TriangleMesh::swap(TriangleMesh &other)

View File

@ -47,10 +47,11 @@ class TriangleMesh
/// copy assignment /// copy assignment
TriangleMesh& operator= (const TriangleMesh& other); TriangleMesh& operator= (const TriangleMesh& other);
#ifndef SLIC3RXS
/// Move assignment /// Move assignment
TriangleMesh& operator= (TriangleMesh&& other); TriangleMesh& operator= (TriangleMesh&& other);
TriangleMesh(TriangleMesh&& other); TriangleMesh(TriangleMesh&& other);
#endif
void swap(TriangleMesh &other); void swap(TriangleMesh &other);
~TriangleMesh(); ~TriangleMesh();
void ReadSTLFile(const std::string &input_file); void ReadSTLFile(const std::string &input_file);