diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index fc7987b29..6f0b2e4d3 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -922,12 +922,13 @@ ConfigSubstitutions PresetBundle::load_config_file_config_bundle(const std::stri // Load the config bundle, but don't save the loaded presets to user profile directory, as only the presets marked as active in the loaded preset bundle // will be loaded into the master PresetBundle and activated. auto [presets_substitutions, presets_imported] = tmp_bundle.load_configbundle(path, {}); + UNUSED(presets_imported); std::string bundle_name = std::string(" - ") + boost::filesystem::path(path).filename().string(); // 2) Extract active configs from the config bundle, copy them and activate them in this bundle. ConfigSubstitutions config_substitutions; - auto load_one = [this, &path, &bundle_name, &presets_substitutions = presets_substitutions, &config_substitutions]( + auto load_one = [&path, &bundle_name, &presets_substitutions = presets_substitutions, &config_substitutions]( PresetCollection &collection_dst, PresetCollection &collection_src, const std::string &preset_name_src, bool activate) -> std::string { // If there are substitutions reported for this preset, move them to config_substitutions. if (auto it = std::find_if(presets_substitutions.begin(), presets_substitutions.end(), [&preset_name_src](const PresetConfigSubstitutions& subs){ return subs.preset_name == preset_name_src; }); @@ -988,7 +989,7 @@ ConfigSubstitutions PresetBundle::load_config_file_config_bundle(const std::stri this->update_compatible(PresetSelectCompatibleType::Never); sort_remove_duplicates(config_substitutions); - return std::move(config_substitutions); + return config_substitutions; } // Process the Config Bundle loaded as a Boost property tree. diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index 62ce67ae4..dfc4f5a3e 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -8,6 +8,7 @@ #include "Platform.hpp" #include "Time.hpp" +#include "libslic3r.h" #ifdef WIN32 #include @@ -128,6 +129,7 @@ void disable_multi_threading() tbb::global_control(tbb::global_control::max_allowed_parallelism, 1); #else // TBB_HAS_GLOBAL_CONTROL static tbb::task_scheduler_init *tbb_init = new tbb::task_scheduler_init(1); + UNUSED(tbb_init); #endif // TBB_HAS_GLOBAL_CONTROL }