diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp index f36bba6310d..d1b3cb169b6 100644 --- a/src/libslic3r/PlaceholderParser.cpp +++ b/src/libslic3r/PlaceholderParser.cpp @@ -40,11 +40,19 @@ #include #include #include +#if BOOST_VERSION >= 107800 +#include +#include +#include +#include +#include +#else #include #include #include #include #include +#endif #include #include #include diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 0c8d645882f..b9243e99f8c 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -18,7 +18,12 @@ #include #include #include + +#if BOOST_VERSION >= 107800 +#include +#else #include +#endif static const float GROUND_Z = -0.04f; static const std::array DEFAULT_MODEL_COLOR = { 0.3255f, 0.337f, 0.337f, 1.0f }; diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 6f619ec8ebf..fbff3def3f8 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3627,7 +3627,7 @@ int MachineObject::parse_json(std::string payload) if (j.contains("upgrade")) { if (j["upgrade"].contains("command")) { if (j["upgrade"]["command"].get() == "upgrade_confirm") { - this->upgrade_display_state == UpgradingInProgress; + this->upgrade_display_state = (int)UpgradingDisplayState::UpgradingInProgress; upgrade_display_hold_count = HOLD_COUNT_MAX; BOOST_LOG_TRIVIAL(info) << "ack of upgrade_confirm"; } diff --git a/src/slic3r/Utils/TCPConsole.cpp b/src/slic3r/Utils/TCPConsole.cpp index 3c943cc6320..277e3c0d5c3 100644 --- a/src/slic3r/Utils/TCPConsole.cpp +++ b/src/slic3r/Utils/TCPConsole.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ void TCPConsole::transmit_next_command() boost::asio::async_write( m_socket, boost::asio::buffer(m_send_buffer), - boost::bind(&TCPConsole::handle_write, this, _1, _2) + boost::bind(&TCPConsole::handle_write, this, boost::placeholders::_1, boost::placeholders::_2) ); } @@ -52,7 +52,7 @@ void TCPConsole::wait_next_line() m_socket, m_recv_buffer, m_newline, - boost::bind(&TCPConsole::handle_read, this, _1, _2) + boost::bind(&TCPConsole::handle_read, this, boost::placeholders::_1, boost::placeholders::_2) ); } @@ -157,7 +157,7 @@ bool TCPConsole::run_queue() auto endpoints = m_resolver.resolve(m_host_name, m_port_name); m_socket.async_connect(endpoints->endpoint(), - boost::bind(&TCPConsole::handle_connect, this, _1) + boost::bind(&TCPConsole::handle_connect, this, boost::placeholders::_1) ); // Loop until we get any reasonable result. Negative result is also result.