3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix of C++11 gcc incompatiblity

Browse Source
This commit is contained in:
bubnikv 2017-02-15 11:16:39 +01:00
parent 3d11d1aebf
commit d67de182a0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xs/src/libslic3r/libslic3r.h
View File

@ -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();
}