From 27bba453312d59898f773aa54d7b625e65fc501e Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Mon, 17 Sep 2018 17:17:38 +0200
Subject: [PATCH] Fix of compilation on Linux, disabled -Wreorder

---
 xs/CMakeLists.txt                        | 2 +-
 xs/src/libslic3r/GCode/PostProcessor.cpp | 4 ++--
 xs/src/libslic3r/Print.hpp               | 1 +
 xs/src/libslic3r/utils.cpp               | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt
index 878ce4dfe..668e6a293 100644
--- a/xs/CMakeLists.txt
+++ b/xs/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     # Workaround for an old CMake, which does not understand CMAKE_CXX_STANDARD.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall" )
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-reorder" )
     find_package(PkgConfig REQUIRED)
 endif()
 
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