From fca7c8abfeb08a4c3e1108cd19d4713dccbd8d2e Mon Sep 17 00:00:00 2001 From: bubnikv Date: Wed, 28 Mar 2018 19:47:26 +0200 Subject: [PATCH] Fixed compilation and test cases. --- xs/src/libslic3r/Print.cpp | 2 +- xs/src/libslic3r/TriangleMesh.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp index a5e826161..d67fe5884 100644 --- a/xs/src/libslic3r/Print.cpp +++ b/xs/src/libslic3r/Print.cpp @@ -159,7 +159,7 @@ bool Print::invalidate_state_by_config_options(const std::vector steps_ignore = {}; + static std::unordered_set steps_ignore; std::vector steps; std::vector osteps; diff --git a/xs/src/libslic3r/TriangleMesh.hpp b/xs/src/libslic3r/TriangleMesh.hpp index 55900656b..9a09975cd 100644 --- a/xs/src/libslic3r/TriangleMesh.hpp +++ b/xs/src/libslic3r/TriangleMesh.hpp @@ -134,7 +134,7 @@ public: typedef std::function throw_on_cancel_callback_type; TriangleMeshSlicer() : mesh(nullptr) {} // Not quite nice, but the constructor and init() methods require non-const mesh pointer to be able to call mesh->require_shared_vertices() - TriangleMeshSlicer(TriangleMesh* mesh) { this->init(mesh, throw_on_cancel_callback_type()); } + TriangleMeshSlicer(TriangleMesh* mesh) { this->init(mesh, [](){}); } void init(TriangleMesh *mesh, throw_on_cancel_callback_type throw_on_cancel); void slice(const std::vector &z, std::vector* layers, throw_on_cancel_callback_type throw_on_cancel) const; void slice(const std::vector &z, std::vector* layers, throw_on_cancel_callback_type throw_on_cancel) const;