|
 |
936cb29 |
--- Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp~ 2020-06-02 21:57:22.366027571 +0100
|
|
|
936cb29 |
+++ Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp 2020-06-02 21:57:25.402028503 +0100
|
|
|
936cb29 |
@@ -7,7 +7,7 @@
|
|
|
936cb29 |
#include <string>
|
|
|
936cb29 |
#include <vector>
|
|
|
936cb29 |
#include <boost/asio.hpp>
|
|
|
936cb29 |
-#include <boost/bind.hpp>
|
|
|
936cb29 |
+#include <boost/bind/bind.hpp>
|
|
|
936cb29 |
#include <boost/thread.hpp>
|
|
|
936cb29 |
#include <boost/core/noncopyable.hpp>
|
|
|
936cb29 |
|
|
|
936cb29 |
@@ -15,6 +15,9 @@
|
|
|
936cb29 |
|
|
|
936cb29 |
namespace asio = boost::asio;
|
|
|
936cb29 |
|
|
|
936cb29 |
+using boost::placeholders::_1;
|
|
|
936cb29 |
+using boost::placeholders::_2;
|
|
|
936cb29 |
+
|
|
|
936cb29 |
class GCodeSender : private boost::noncopyable {
|
|
|
936cb29 |
public:
|
|
|
936cb29 |
GCodeSender();
|
|
|
936cb29 |
--- Slic3r-1.3.0/xs/src/libslic3r/GCodeTimeEstimator.cpp~ 2020-06-02 22:32:22.480733519 +0100
|
|
|
936cb29 |
+++ Slic3r-1.3.0/xs/src/libslic3r/GCodeTimeEstimator.cpp 2020-06-02 22:32:25.806734748 +0100
|
|
|
936cb29 |
@@ -1,9 +1,12 @@
|
|
|
936cb29 |
#include "GCodeTimeEstimator.hpp"
|
|
|
936cb29 |
-#include <boost/bind.hpp>
|
|
|
936cb29 |
+#include <boost/bind/bind.hpp>
|
|
|
936cb29 |
#include <cmath>
|
|
|
936cb29 |
|
|
|
936cb29 |
namespace Slic3r {
|
|
|
936cb29 |
|
|
|
936cb29 |
+using boost::placeholders::_1;
|
|
|
936cb29 |
+using boost::placeholders::_2;
|
|
|
936cb29 |
+
|
|
|
936cb29 |
void
|
|
|
936cb29 |
GCodeTimeEstimator::parse(const std::string &gcode)
|
|
|
936cb29 |
{
|
|
|
936cb29 |
--- Slic3r-1.3.0/xs/src/libslic3r/PrintObject.cpp~ 2020-06-02 22:10:25.204272253 +0100
|
|
|
936cb29 |
+++ Slic3r-1.3.0/xs/src/libslic3r/PrintObject.cpp 2020-06-02 22:11:39.803295580 +0100
|
|
|
936cb29 |
@@ -2,11 +2,14 @@
|
|
|
936cb29 |
#include "BoundingBox.hpp"
|
|
|
936cb29 |
#include "ClipperUtils.hpp"
|
|
|
936cb29 |
#include "Geometry.hpp"
|
|
|
936cb29 |
+#include <boost/bind/bind.hpp>
|
|
|
936cb29 |
#include <algorithm>
|
|
|
936cb29 |
#include <vector>
|
|
|
936cb29 |
|
|
|
936cb29 |
namespace Slic3r {
|
|
|
936cb29 |
|
|
|
936cb29 |
+using boost::placeholders::_1;
|
|
|
936cb29 |
+
|
|
|
936cb29 |
PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
|
|
|
936cb29 |
: layer_height_spline(model_object->layer_height_spline),
|
|
|
936cb29 |
typed_slices(false),
|
|
|
936cb29 |
--- Slic3r-1.3.0/xs/src/libslic3r/SLAPrint.cpp~ 2020-06-02 22:25:43.439589772 +0100
|
|
|
936cb29 |
+++ Slic3r-1.3.0/xs/src/libslic3r/SLAPrint.cpp 2020-06-02 22:26:00.324595850 +0100
|
|
|
936cb29 |
@@ -7,9 +7,12 @@
|
|
|
936cb29 |
#include <iostream>
|
|
|
936cb29 |
#include <complex>
|
|
|
936cb29 |
#include <cstdio>
|
|
|
936cb29 |
+#include <boost/bind/bind.hpp>
|
|
|
936cb29 |
|
|
|
936cb29 |
namespace Slic3r {
|
|
|
936cb29 |
|
|
|
936cb29 |
+using boost::placeholders::_1;
|
|
|
936cb29 |
+
|
|
|
936cb29 |
void
|
|
|
936cb29 |
SLAPrint::slice()
|
|
|
936cb29 |
{
|
|
|
936cb29 |
--- Slic3r-1.3.0/xs/src/libslic3r/TriangleMesh.cpp~ 2020-06-02 22:18:32.071434546 +0100
|
|
|
936cb29 |
+++ Slic3r-1.3.0/xs/src/libslic3r/TriangleMesh.cpp 2020-06-02 22:19:16.409450504 +0100
|
|
|
936cb29 |
@@ -14,6 +14,7 @@
|
|
|
936cb29 |
#include <stdexcept>
|
|
|
936cb29 |
#include <boost/config.hpp>
|
|
|
936cb29 |
#include <boost/nowide/convert.hpp>
|
|
|
936cb29 |
+#include <boost/bind/bind.hpp>
|
|
|
936cb29 |
|
|
|
936cb29 |
#ifdef SLIC3R_DEBUG
|
|
|
936cb29 |
#include "SVG.hpp"
|
|
|
936cb29 |
@@ -21,6 +22,8 @@
|
|
|
936cb29 |
|
|
|
936cb29 |
namespace Slic3r {
|
|
|
936cb29 |
|
|
|
936cb29 |
+using boost::placeholders::_1;
|
|
|
936cb29 |
+
|
|
|
936cb29 |
TriangleMesh::TriangleMesh()
|
|
|
936cb29 |
: repaired(false)
|
|
|
936cb29 |
{
|