From d67de182a075a31cd6ea7f3f3f2dc87fc907eace Mon Sep 17 00:00:00 2001 From: bubnikv Date: Wed, 15 Feb 2017 11:16:39 +0100 Subject: [PATCH] fix of C++11 gcc incompatiblity --- xs/src/libslic3r/libslic3r.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xs/src/libslic3r/libslic3r.h b/xs/src/libslic3r/libslic3r.h index d36e79ab3..82d20a854 100644 --- a/xs/src/libslic3r/libslic3r.h +++ b/xs/src/libslic3r/libslic3r.h @@ -11,8 +11,6 @@ #include #include #include -#include -#include #include #define SLIC3R_FORK_NAME "Slic3r Prusa Edition" @@ -145,7 +143,7 @@ void append(std::vector& dest, const std::vector& src) if (dest.empty()) dest = src; else - dest.insert(std::end(dest), std::cbegin(src), std::cend(src)); + dest.insert(dest.end(), src.begin(), src.end()); } template @@ -154,9 +152,7 @@ void append(std::vector& dest, std::vector&& src) if (dest.empty()) dest = std::move(src); else - dest.insert(std::end(dest), - std::make_move_iterator(std::begin(src)), - std::make_move_iterator(std::end(src))); + std::move(std::begin(src), std::end(src), std::back_inserter(dest)); src.clear(); src.shrink_to_fit(); }