diff options
author | bubnikv <bubnikv@gmail.com> | 2017-02-15 13:16:39 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2017-02-15 13:16:39 +0300 |
commit | d67de182a075a31cd6ea7f3f3f2dc87fc907eace (patch) | |
tree | 3b44b2275d0571630198bb5f97a62f7bf443cb91 /xs | |
parent | 3d11d1aebfee4fc1a592832b60ed142874d1ada7 (diff) |
fix of C++11 gcc incompatiblity
Diffstat (limited to 'xs')
-rw-r--r-- | xs/src/libslic3r/libslic3r.h | 8 |
1 files 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 <stdint.h> #include <stdarg.h> #include <vector> -#include <iterator> -#include <utility> #include <boost/thread.hpp> #define SLIC3R_FORK_NAME "Slic3r Prusa Edition" @@ -145,7 +143,7 @@ void append(std::vector<T>& dest, const std::vector<T>& 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 <typename T> @@ -154,9 +152,7 @@ void append(std::vector<T>& dest, std::vector<T>&& 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(); } |