From 2f8c88cb963d41eebccc507f2d9e4ad07fbef085 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Fri, 13 Jul 2018 19:41:44 -0500 Subject: [PATCH] Don't use the new methods on perl side (avoid test failure in tmf) --- xs/src/libslic3r/TriangleMesh.cpp | 2 ++ xs/src/libslic3r/TriangleMesh.hpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp index 95f6ea33d..2551e0165 100644 --- a/xs/src/libslic3r/TriangleMesh.cpp +++ b/xs/src/libslic3r/TriangleMesh.cpp @@ -108,6 +108,7 @@ void TriangleMesh::clone(const TriangleMesh& other) { } } +#ifndef SLIC3RXS TriangleMesh::TriangleMesh(TriangleMesh&& other) { this->repaired = std::move(other.repaired); this->stl = std::move(other.stl); @@ -120,6 +121,7 @@ TriangleMesh& TriangleMesh::operator= (TriangleMesh&& other) return *this; } +#endif void TriangleMesh::swap(TriangleMesh &other) diff --git a/xs/src/libslic3r/TriangleMesh.hpp b/xs/src/libslic3r/TriangleMesh.hpp index 6bf113686..84104e5b8 100644 --- a/xs/src/libslic3r/TriangleMesh.hpp +++ b/xs/src/libslic3r/TriangleMesh.hpp @@ -47,10 +47,11 @@ class TriangleMesh /// copy assignment TriangleMesh& operator= (const TriangleMesh& other); +#ifndef SLIC3RXS /// Move assignment TriangleMesh& operator= (TriangleMesh&& other); TriangleMesh(TriangleMesh&& other); - +#endif void swap(TriangleMesh &other); ~TriangleMesh(); void ReadSTLFile(const std::string &input_file);