From d5084db14e7b4e75bf588fe063a5b9941c1cac31 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 3 Jun 2020 01:05:39 +0200 Subject: [PATCH] Make boost::Placeholders::_1 visible Fixes https://github.com/slic3r/Slic3r/issues/4967 --- xs/src/libslic3r/GCodeSender.hpp | 5 ++++- xs/src/libslic3r/GCodeTimeEstimator.cpp | 5 ++++- xs/src/libslic3r/PrintObject.cpp | 3 +++ xs/src/libslic3r/SLAPrint.cpp | 3 +++ xs/src/libslic3r/TriangleMesh.cpp | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp index 0f39f5a3d1..92101d3fb8 100644 --- a/xs/src/libslic3r/GCodeSender.hpp +++ b/xs/src/libslic3r/GCodeSender.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include @@ -15,6 +15,9 @@ namespace Slic3r { namespace asio = boost::asio; +using boost::placeholders::_1; +using boost::placeholders::_2; + class GCodeSender : private boost::noncopyable { public: GCodeSender(); diff --git a/xs/src/libslic3r/GCodeTimeEstimator.cpp b/xs/src/libslic3r/GCodeTimeEstimator.cpp index 818896bc16..b705032c80 100644 --- a/xs/src/libslic3r/GCodeTimeEstimator.cpp +++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp @@ -1,9 +1,12 @@ #include "GCodeTimeEstimator.hpp" -#include +#include #include namespace Slic3r { +using boost::placeholders::_1; +using boost::placeholders::_2; + void GCodeTimeEstimator::parse(const std::string &gcode) { diff --git a/xs/src/libslic3r/PrintObject.cpp b/xs/src/libslic3r/PrintObject.cpp index 4b58307f28..d3fce91e21 100644 --- a/xs/src/libslic3r/PrintObject.cpp +++ b/xs/src/libslic3r/PrintObject.cpp @@ -4,12 +4,15 @@ #include "Geometry.hpp" #include "Log.hpp" #include "TransformationMatrix.hpp" +#include #include #include #include namespace Slic3r { +using boost::placeholders::_1; + PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox) : layer_height_spline(model_object->layer_height_spline), typed_slices(false), diff --git a/xs/src/libslic3r/SLAPrint.cpp b/xs/src/libslic3r/SLAPrint.cpp index 84ce3568f8..7b50c8d9e1 100644 --- a/xs/src/libslic3r/SLAPrint.cpp +++ b/xs/src/libslic3r/SLAPrint.cpp @@ -7,9 +7,12 @@ #include #include #include +#include namespace Slic3r { +using boost::placeholders::_1; + void SLAPrint::slice() { diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp index 63c5a91b70..5ca2d3d396 100644 --- a/xs/src/libslic3r/TriangleMesh.cpp +++ b/xs/src/libslic3r/TriangleMesh.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef SLIC3R_DEBUG #include "SVG.hpp" @@ -22,6 +23,8 @@ namespace Slic3r { +using boost::placeholders::_1; + TriangleMesh::TriangleMesh() : repaired(false) {