diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-03-28 20:47:26 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-03-28 20:47:26 +0300 |
| commit | fca7c8abfeb08a4c3e1108cd19d4713dccbd8d2e (patch) | |
| tree | 7b1de1568bbc96e17634f6f138bec0a77abf6757 /xs | |
| parent | 33e1108f65ff3dc893ea73e56774ba3d5cf031c1 (diff) | |
Fixed compilation and test cases.
Diffstat (limited to 'xs')
| -rw-r--r-- | xs/src/libslic3r/Print.cpp | 2 | ||||
| -rw-r--r-- | 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<t_config_option "wipe" }; - static std::unordered_set<std::string> steps_ignore = {}; + static std::unordered_set<std::string> steps_ignore; std::vector<PrintStep> steps; std::vector<PrintObjectStep> 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<void()> 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<float> &z, std::vector<Polygons>* layers, throw_on_cancel_callback_type throw_on_cancel) const; void slice(const std::vector<float> &z, std::vector<ExPolygons>* layers, throw_on_cancel_callback_type throw_on_cancel) const; |