diff options
| author | Vojtech Bubnik <bubnikv@gmail.com> | 2018-09-17 18:17:38 +0300 |
|---|---|---|
| committer | Vojtech Bubnik <bubnikv@gmail.com> | 2018-09-17 18:17:38 +0300 |
| commit | 27bba453312d59898f773aa54d7b625e65fc501e (patch) | |
| tree | c63bb3a9420b58eb69225c4ded4682757d1c4532 /xs/src | |
| parent | 153bd108a209a102f4f99d20c531c8ebf3ef3a7a (diff) | |
Fix of compilation on Linux, disabled -Wreorder
Diffstat (limited to 'xs/src')
| -rw-r--r-- | xs/src/libslic3r/GCode/PostProcessor.cpp | 4 | ||||
| -rw-r--r-- | xs/src/libslic3r/Print.hpp | 1 | ||||
| -rw-r--r-- | xs/src/libslic3r/utils.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/xs/src/libslic3r/GCode/PostProcessor.cpp b/xs/src/libslic3r/GCode/PostProcessor.cpp index 438d6d70b..c04aeae3c 100644 --- a/xs/src/libslic3r/GCode/PostProcessor.cpp +++ b/xs/src/libslic3r/GCode/PostProcessor.cpp @@ -1,7 +1,7 @@ #include "PostProcessor.hpp" - -#ifdef WIN32 +#if 1 +//#ifdef WIN32 namespace Slic3r { diff --git a/xs/src/libslic3r/Print.hpp b/xs/src/libslic3r/Print.hpp index 19da875ab..7f88110bc 100644 --- a/xs/src/libslic3r/Print.hpp +++ b/xs/src/libslic3r/Print.hpp @@ -2,6 +2,7 @@ #define slic3r_Print_hpp_ #include "libslic3r.h" +#include <atomic> #include <set> #include <vector> #include <string> diff --git a/xs/src/libslic3r/utils.cpp b/xs/src/libslic3r/utils.cpp index 46ee65a35..2fbfcae81 100644 --- a/xs/src/libslic3r/utils.cpp +++ b/xs/src/libslic3r/utils.cpp @@ -205,7 +205,7 @@ int rename_file(const std::string &from, const std::string &to) #else - boost::nowide::remove(from.c_str()); + boost::nowide::remove(to.c_str()); ec = boost::nowide::rename(from.c_str(), to.c_str()); #endif |