3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix build warnings, update deprecated boost headers (#1035)

Browse source 
Fix build warnings, update deprecated boost headers.
This commit is contained in:
Scott Mudge 2023-05-11 11:46:15 -04:00 • committed by GitHub
parent 2e2ea807a6
commit e23b600239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libslic3r/PlaceholderParser.cpp
View file

@ -40,11 +40,19 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_lit.hpp> #include <boost/spirit/include/qi_lit.hpp>
#if BOOST_VERSION >= 107800
#include <boost/phoenix/core.hpp>
#include <boost/phoenix/operator.hpp>
#include <boost/phoenix/fusion.hpp>
#include <boost/phoenix/stl.hpp>
#include <boost/phoenix/object.hpp>
#else
#include <boost/spirit/include/phoenix_core.hpp> #include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp> #include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp> #include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_stl.hpp> #include <boost/spirit/include/phoenix_stl.hpp>
#include <boost/spirit/include/phoenix_object.hpp> #include <boost/spirit/include/phoenix_object.hpp>
#endif
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>
#include <boost/spirit/repository/include/qi_distinct.hpp> #include <boost/spirit/repository/include/qi_distinct.hpp>
#include <boost/spirit/repository/include/qi_iter_pos.hpp> #include <boost/spirit/repository/include/qi_iter_pos.hpp>

5
src/slic3r/GUI/3DBed.cpp
View file

@ -18,7 +18,12 @@
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#if BOOST_VERSION >= 107800
#include <boost/timer/timer.hpp>
#else
#include <boost/timer.hpp> #include <boost/timer.hpp>
#endif
static const float GROUND_Z = -0.04f; static const float GROUND_Z = -0.04f;
static const std::array<float, 4> DEFAULT_MODEL_COLOR = { 0.3255f, 0.337f, 0.337f, 1.0f }; static const std::array<float, 4> DEFAULT_MODEL_COLOR = { 0.3255f, 0.337f, 0.337f, 1.0f };

2
src/slic3r/GUI/DeviceManager.cpp
View file

@ -3627,7 +3627,7 @@ int MachineObject::parse_json(std::string payload)
if (j.contains("upgrade")) { if (j.contains("upgrade")) {
if (j["upgrade"].contains("command")) { if (j["upgrade"].contains("command")) {
if (j["upgrade"]["command"].get<std::string>() == "upgrade_confirm") { if (j["upgrade"]["command"].get<std::string>() == "upgrade_confirm") {
this->upgrade_display_state == UpgradingInProgress; this->upgrade_display_state = (int)UpgradingDisplayState::UpgradingInProgress;
upgrade_display_hold_count = HOLD_COUNT_MAX; upgrade_display_hold_count = HOLD_COUNT_MAX;
BOOST_LOG_TRIVIAL(info) << "ack of upgrade_confirm"; BOOST_LOG_TRIVIAL(info) << "ack of upgrade_confirm";
} }

8
src/slic3r/Utils/TCPConsole.cpp
View file

@ -4,7 +4,7 @@
#include <boost/asio/read_until.hpp> #include <boost/asio/read_until.hpp>
#include <boost/asio/steady_timer.hpp> #include <boost/asio/steady_timer.hpp>
#include <boost/asio/write.hpp> #include <boost/asio/write.hpp>
#include <boost/bind.hpp> #include <boost/bind/bind.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@ -41,7 +41,7 @@ void TCPConsole::transmit_next_command()
boost::asio::async_write( boost::asio::async_write(
m_socket, m_socket,
boost::asio::buffer(m_send_buffer), 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_socket,
m_recv_buffer, m_recv_buffer,
m_newline, 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); auto endpoints = m_resolver.resolve(m_host_name, m_port_name);
m_socket.async_connect(endpoints->endpoint(), 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. // Loop until we get any reasonable result. Negative result is also result.