3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-19 23:01:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

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

@ -18,7 +18,12 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/log/trivial.hpp>
#if BOOST_VERSION >= 107800
#include <boost/timer/timer.hpp>
#else
#include <boost/timer.hpp>
#endif
static const float GROUND_Z = -0.04f;
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["upgrade"].contains("command")) {
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;
BOOST_LOG_TRIVIAL(info) << "ack of upgrade_confirm";
}