mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-14 07:55:55 +08:00
Fix some includes and undefined variable in assert
This commit is contained in:
parent
4af2ba5eaf
commit
a30003dd3e
@ -150,7 +150,7 @@ bool contains_path_dir(const std::string& p, const std::string& dir_name)
|
||||
|
||||
boost::filesystem::path get_existing_dir(const std::string& sub, const std::string& dir_name)
|
||||
{
|
||||
assert(!p.empty() && !dir_name.empty());
|
||||
assert(!sub.empty() && !dir_name.empty());
|
||||
boost::filesystem::path path = boost::filesystem::path(sub) / dir_name;
|
||||
boost::system::error_code ec;
|
||||
if (!boost::filesystem::exists(path, ec) || ec) {
|
||||
|
@ -10,6 +10,7 @@
|
||||
#include <boost/format.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
#include <iostream>
|
||||
|
||||
#include "format.hpp"
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/property_tree/json_parser.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
namespace pt = boost::property_tree;
|
||||
|
||||
@ -117,7 +118,7 @@ void fill_config_options_from_json_inner(boost::property_tree::ptree& ptree, std
|
||||
for (const auto &subtree : slots) {
|
||||
size_t slot_id;
|
||||
try {
|
||||
slot_id = boost::lexical_cast<size_t>(subtree.first);
|
||||
slot_id = boost::lexical_cast<std::size_t>(subtree.first);
|
||||
} catch (const boost::bad_lexical_cast&) {
|
||||
continue;
|
||||
}
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
#include <boost/property_tree/ptree.hpp>
|
||||
|
||||
@ -24,4 +25,4 @@ std::string get_print_data_from_json(const std::string &json, const std::string
|
||||
|
||||
}}} // Slic3r::GUI::UserAccountUtils
|
||||
|
||||
#endif // slic3r_UserAccountUtils_hpp_
|
||||
#endif // slic3r_UserAccountUtils_hpp_
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/property_tree/ini_parser.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
|
||||
#include "Widgets/ComboBox.hpp"
|
||||
|
||||
@ -317,4 +318,4 @@ void WifiConfigDialog::on_dpi_changed(const wxRect& suggested_rect)
|
||||
Fit();
|
||||
Refresh();
|
||||
}
|
||||
}}// Slicer::GUI
|
||||
}}// Slicer::GUI
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
#include <boost/nowide/convert.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
#include <boost/property_tree/ini_parser.hpp>
|
||||
#include <curl/curl.h>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user