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
|
From: Anton Gladky <gladk@debian.org>
Date: Tue, 23 Mar 2021 00:52:16 +0800
Subject: Fix compilation against boost_1,74
Bug-Debian: https://bugs.debian.org/977449
Last-Update: 2020-12-15
---
xs/src/admesh/stl.h | 2 +-
xs/src/libslic3r/Config.cpp | 2 +-
xs/src/libslic3r/PrintObject.cpp | 8 ++++----
xs/src/libslic3r/SLAPrint.cpp | 2 +-
xs/src/libslic3r/TriangleMesh.cpp | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/xs/src/admesh/stl.h b/xs/src/admesh/stl.h
index 9b04602..6d501c6 100644
--- a/xs/src/admesh/stl.h
+++ b/xs/src/admesh/stl.h
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
-#include <boost/detail/endian.hpp>
+#include <boost/endian/arithmetic.hpp>
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
#include "windows.h"
diff --git a/xs/src/libslic3r/Config.cpp b/xs/src/libslic3r/Config.cpp
index ad11df7..eeed894 100644
--- a/xs/src/libslic3r/Config.cpp
+++ b/xs/src/libslic3r/Config.cpp
@@ -13,7 +13,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>
diff --git a/xs/src/libslic3r/PrintObject.cpp b/xs/src/libslic3r/PrintObject.cpp
index 6d60f3c..8ccefe5 100644
--- a/xs/src/libslic3r/PrintObject.cpp
+++ b/xs/src/libslic3r/PrintObject.cpp
@@ -344,7 +344,7 @@ PrintObject::detect_surfaces_type()
parallelize<Layer*>(
std::queue<Layer*>(std::deque<Layer*>(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue<Layer*>
- boost::bind(&Slic3r::Layer::detect_surfaces_type, _1),
+ boost::bind(&Slic3r::Layer::detect_surfaces_type, boost::placeholders::_1),
this->_print->config.threads.value
);
@@ -357,7 +357,7 @@ PrintObject::process_external_surfaces()
{
parallelize<Layer*>(
std::queue<Layer*>(std::deque<Layer*>(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue<Layer*>
- boost::bind(&Slic3r::Layer::process_external_surfaces, _1),
+ boost::bind(&Slic3r::Layer::process_external_surfaces, boost::placeholders::_1),
this->_print->config.threads.value
);
}
@@ -1046,7 +1046,7 @@ PrintObject::_make_perimeters()
parallelize<Layer*>(
std::queue<Layer*>(std::deque<Layer*>(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue<Layer*>
- boost::bind(&Slic3r::Layer::make_perimeters, _1),
+ boost::bind(&Slic3r::Layer::make_perimeters, boost::placeholders::_1),
this->_print->config.threads.value
);
@@ -1068,7 +1068,7 @@ PrintObject::_infill()
parallelize<Layer*>(
std::queue<Layer*>(std::deque<Layer*>(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue<Layer*>
- boost::bind(&Slic3r::Layer::make_fills, _1),
+ boost::bind(&Slic3r::Layer::make_fills, boost::placeholders::_1),
this->_print->config.threads.value
);
diff --git a/xs/src/libslic3r/SLAPrint.cpp b/xs/src/libslic3r/SLAPrint.cpp
index ceb8901..3f0def7 100644
--- a/xs/src/libslic3r/SLAPrint.cpp
+++ b/xs/src/libslic3r/SLAPrint.cpp
@@ -67,7 +67,7 @@ SLAPrint::slice()
parallelize<size_t>(
0,
this->layers.size()-1,
- boost::bind(&SLAPrint::_infill_layer, this, _1, fill.get()),
+ boost::bind(&SLAPrint::_infill_layer, this, boost::placeholders::_1, fill.get()),
this->config.threads.value
);
}
diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp
index e4be594..939159c 100644
--- a/xs/src/libslic3r/TriangleMesh.cpp
+++ b/xs/src/libslic3r/TriangleMesh.cpp
@@ -771,7 +771,7 @@ TriangleMeshSlicer<A>::slice(const std::vector<float> &z, std::vector<Polygons>*
parallelize<int>(
0,
this->mesh->stl.stats.number_of_facets-1,
- boost::bind(&TriangleMeshSlicer<A>::_slice_do, this, _1, &lines, &lines_mutex, z)
+ boost::bind(&TriangleMeshSlicer<A>::_slice_do, this, boost::placeholders::_1, &lines, &lines_mutex, z)
);
}
@@ -782,7 +782,7 @@ TriangleMeshSlicer<A>::slice(const std::vector<float> &z, std::vector<Polygons>*
parallelize<size_t>(
0,
lines.size()-1,
- boost::bind(&TriangleMeshSlicer<A>::_make_loops_do, this, _1, &lines, layers)
+ boost::bind(&TriangleMeshSlicer<A>::_make_loops_do, this, boost::placeholders::_1, &lines, layers)
);
}
|
