1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
--- a/xs/src/libslic3r/TriangleMesh.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/src/libslic3r/TriangleMesh.cpp (date 1607117258000)
@@ -22,6 +22,8 @@
namespace Slic3r {
+using boost::placeholders::_1;
+
TriangleMesh::TriangleMesh()
: repaired(false)
{
--- a/src/CMakeLists.txt (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/src/CMakeLists.txt (date 1607117046000)
@@ -115,7 +115,7 @@
find_package(Threads REQUIRED)
set(Boost_NO_BOOST_CMAKE ON)
-find_package(Boost REQUIRED COMPONENTS system thread filesystem)
+find_package(Boost REQUIRED COMPONENTS system thread filesystem nowide)
set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
set(GUI_LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/GUI/)
--- a/xs/src/libslic3r/PrintObject.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/src/libslic3r/PrintObject.cpp (date 1607117227000)
@@ -4,12 +4,15 @@
#include "Geometry.hpp"
#include "Log.hpp"
#include "TransformationMatrix.hpp"
+#include <boost/bind/bind.hpp>
#include <algorithm>
#include <vector>
#include <limits>
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),
--- a/xs/src/libslic3r/GCodeSender.hpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/src/libslic3r/GCodeSender.hpp (date 1607117162000)
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include <boost/thread.hpp>
#include <boost/core/noncopyable.hpp>
@@ -15,6 +15,9 @@
namespace asio = boost::asio;
+using boost::placeholders::_1;
+using boost::placeholders::_2;
+
class GCodeSender : private boost::noncopyable {
public:
GCodeSender();
--- a/xs/src/libslic3r/SLAPrint.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/src/libslic3r/SLAPrint.cpp (date 1607117248000)
@@ -7,9 +7,12 @@
#include <iostream>
#include <complex>
#include <cstdio>
+#include <boost/bind/bind.hpp>
namespace Slic3r {
+using boost::placeholders::_1;
+
void
SLAPrint::slice()
{
--- a/xs/src/libslic3r/ConfigBase.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/src/libslic3r/ConfigBase.cpp (date 1607117107000)
@@ -16,7 +16,7 @@
#include <boost/config.hpp>
#include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>
-#include <boost/nowide/cenv.hpp>
+#include <boost/nowide/cstdlib.hpp>
#include <boost/nowide/fstream.hpp>
#include <boost/property_tree/ini_parser.hpp>
#include <boost/property_tree/ptree.hpp>
--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp (date 1607117194000)
@@ -1,9 +1,12 @@
#include "GCodeTimeEstimator.hpp"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include <cmath>
namespace Slic3r {
+using boost::placeholders::_1;
+using boost::placeholders::_2;
+
void
GCodeTimeEstimator::parse(const std::string &gcode)
{
--- a/xs/Build.PL (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/Build.PL (date 1607117077000)
@@ -151,7 +151,7 @@
}
# In order to generate the -l switches we need to know how Boost libraries are named
my $have_boost = 0;
-my @boost_libraries = qw(system thread filesystem); # we need these
+my @boost_libraries = qw(system thread filesystem nowide); # we need these
# check without explicit lib path (works on Linux)
if (! $mswin) {
$have_boost = 1
--- a/xs/src/libslic3r/SupportMaterial.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
+++ b/xs/src/libslic3r/SupportMaterial.cpp (date 1607118181000)
@@ -4,6 +4,8 @@
namespace Slic3r
{
+using boost::placeholders::_1;
+
PolylineCollection _fill_surface(Fill *fill, Surface *surface)
{
PolylineCollection ps;
|
