3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing some compiler warnings.

Browse source
This commit is contained in:
Vojtech Bubnik 2021-06-27 17:45:41 +02:00
parent e4e8c5df12
commit 211110ce53
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/PresetBundle.cpp
View file

@ -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 // 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. // will be loaded into the master PresetBundle and activated.
auto [presets_substitutions, presets_imported] = tmp_bundle.load_configbundle(path, {}); 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(); 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. // 2) Extract active configs from the config bundle, copy them and activate them in this bundle.
ConfigSubstitutions config_substitutions; 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 { 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 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; }); 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); this->update_compatible(PresetSelectCompatibleType::Never);
sort_remove_duplicates(config_substitutions); sort_remove_duplicates(config_substitutions);
return std::move(config_substitutions); return config_substitutions;
} }
// Process the Config Bundle loaded as a Boost property tree. // Process the Config Bundle loaded as a Boost property tree.

2
src/libslic3r/utils.cpp
View file

@ -8,6 +8,7 @@
#include "Platform.hpp" #include "Platform.hpp"
#include "Time.hpp" #include "Time.hpp"
#include "libslic3r.h"
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
@ -128,6 +129,7 @@ void disable_multi_threading()
tbb::global_control(tbb::global_control::max_allowed_parallelism, 1); tbb::global_control(tbb::global_control::max_allowed_parallelism, 1);
#else // TBB_HAS_GLOBAL_CONTROL #else // TBB_HAS_GLOBAL_CONTROL
static tbb::task_scheduler_init *tbb_init = new tbb::task_scheduler_init(1); static tbb::task_scheduler_init *tbb_init = new tbb::task_scheduler_init(1);
UNUSED(tbb_init);
#endif // TBB_HAS_GLOBAL_CONTROL #endif // TBB_HAS_GLOBAL_CONTROL
} }