Fix of compilation on Linux, disabled -Wreorder
This commit is contained in:
parent
153bd108a2
commit
27bba45331
@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/)
|
|||||||
|
|
||||||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||||
# Workaround for an old CMake, which does not understand CMAKE_CXX_STANDARD.
|
# 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)
|
find_package(PkgConfig REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "PostProcessor.hpp"
|
#include "PostProcessor.hpp"
|
||||||
|
|
||||||
|
#if 1
|
||||||
#ifdef WIN32
|
//#ifdef WIN32
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define slic3r_Print_hpp_
|
#define slic3r_Print_hpp_
|
||||||
|
|
||||||
#include "libslic3r.h"
|
#include "libslic3r.h"
|
||||||
|
#include <atomic>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
@ -205,7 +205,7 @@ int rename_file(const std::string &from, const std::string &to)
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
boost::nowide::remove(from.c_str());
|
boost::nowide::remove(to.c_str());
|
||||||
ec = boost::nowide::rename(from.c_str(), to.c_str());
|
ec = boost::nowide::rename(from.c_str(), to.c_str());
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user