3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 15:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix typos preventing compilation with CPPVER >= 11

Browse source
This commit is contained in:
Sakari Kapanen 2016-11-02 22:29:59 +02:00
parent d530bdba67
commit 381c88ce0c
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/src/libslic3r/ExPolygon.hpp
View file

@ -104,12 +104,12 @@ inline void polygons_append(Polygons &dst, const ExPolygons &src)
} }
#if SLIC3R_CPPVER >= 11 #if SLIC3R_CPPVER >= 11
inline void polygons_append(Polygons &dst, ExPolygons &&src) inline void polygons_append(Polygons &dst, ExPolygons &&src)
{ {
dst.reserve(dst.size() + number_polygons(src)); dst.reserve(dst.size() + number_polygons(src));
for (ExPolygons::const_iterator it = expolys.begin(); it != expolys.end(); ++ it) { for (ExPolygons::const_iterator it = src.begin(); it != src.end(); ++ it) {
dst.push_back(std::move(it->contour)); dst.push_back(std::move(it->contour));
std::move(std::begin(it->contour), std::end(it->contour), std::back_inserter(dst)); std::move(std::begin(it->holes), std::end(it->holes), std::back_inserter(dst));
} }
} }
#endif #endif

7
xs/src/libslic3r/Surface.hpp
View file

@ -99,11 +99,12 @@ inline Polygons to_polygons(const SurfacesPtr &src)
#if SLIC3R_CPPVER >= 11 #if SLIC3R_CPPVER >= 11
inline Polygons to_polygons(SurfacesPtr &&src) inline Polygons to_polygons(SurfacesPtr &&src)
{ {
size_t num = 0;
for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++it) for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++it)
num += (*it)->expolygon.holes.size() + 1; num += (*it)->expolygon.holes.size() + 1;
Polygons polygons; Polygons polygons;
polygons.reserve(num); polygons.reserve(num);
for (ExPolygons::const_iterator it = src.begin(); it != src.end(); ++it) { for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++it) {
polygons.push_back(std::move((*it)->expolygon.contour)); polygons.push_back(std::move((*it)->expolygon.contour));
for (Polygons::const_iterator ith = (*it)->expolygon.holes.begin(); ith != (*it)->expolygon.holes.end(); ++ith) { for (Polygons::const_iterator ith = (*it)->expolygon.holes.begin(); ith != (*it)->expolygon.holes.end(); ++ith) {
polygons.push_back(std::move(*ith)); polygons.push_back(std::move(*ith));
@ -146,7 +147,7 @@ inline void polygons_append(Polygons &dst, Surfaces &&src)
dst.reserve(dst.size() + number_polygons(src)); dst.reserve(dst.size() + number_polygons(src));
for (Surfaces::const_iterator it = src.begin(); it != src.end(); ++ it) { for (Surfaces::const_iterator it = src.begin(); it != src.end(); ++ it) {
dst.push_back(std::move(it->expolygon.contour)); dst.push_back(std::move(it->expolygon.contour));
std::move(std::begin(it->expolygon.contour), std::end(it->expolygon.contour), std::back_inserter(dst)); std::move(std::begin(it->expolygon.holes), std::end(it->expolygon.holes), std::back_inserter(dst));
} }
} }
#endif #endif
@ -167,7 +168,7 @@ inline void polygons_append(Polygons &dst, SurfacesPtr &&src)
dst.reserve(dst.size() + number_polygons(src)); dst.reserve(dst.size() + number_polygons(src));
for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++ it) { for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++ it) {
dst.push_back(std::move((*it)->expolygon.contour)); dst.push_back(std::move((*it)->expolygon.contour));
std::move(std::begin((*it)->expolygon.contour), std::end((*it)->expolygon.contour), std::back_inserter(dst)); std::move(std::begin((*it)->expolygon.holes), std::end((*it)->expolygon.holes), std::back_inserter(dst));
} }
} }
#endif #endif