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

One more fix of the preceding commit.

Browse source
This commit is contained in:
bubnikv 2017-10-17 17:48:04 +02:00
parent 38aca5047f
commit 67ce4d862b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xs/src/libslic3r/Config.hpp
View file

@ -680,7 +680,7 @@ public:
static bool has(T value)
{
for (const std::map<std::string,int> &kvp : get_enum_values())
for (const std::pair<std::string, int> &kvp : ConfigOptionEnum<T>::get_enum_values())
if (kvp.second == value)
return true;
return false;
@ -694,11 +694,11 @@ public:
// Initialize the map.
const t_config_enum_values &enum_keys_map = ConfigOptionEnum<T>::get_enum_values();
int cnt = 0;
for (auto &kvp : enum_keys_map)
for (const std::pair<std::string, int> &kvp : enum_keys_map)
cnt = std::max(cnt, kvp.second);
cnt += 1;
names.assign(cnt, "");
for (auto &kvp : enum_keys_map)
for (const std::pair<std::string, int> &kvp : enum_keys_map)
names[kvp.second] = kvp.first;
}
return names;
@ -998,7 +998,7 @@ protected:
class UnknownOptionException : public std::exception
{
public:
const char* what() const override { return "Unknown config option"; }
const char* what() const _NOEXCEPT override { return "Unknown config option"; }
};
}

2
xs/src/libslic3r/PrintConfig.hpp
View file

@ -265,7 +265,7 @@ private: \
} \
} \
/* Cache object holding a key/option map, a list of option keys and a copy of this static config initialized with the defaults. */ \
static StaticCache<CLASS_NAME> s_cache_##CLASS_NAME;
static StaticPrintConfig::StaticCache<CLASS_NAME> s_cache_##CLASS_NAME;
#define STATIC_PRINT_CONFIG_CACHE(CLASS_NAME) \
STATIC_PRINT_CONFIG_CACHE_BASE(CLASS_NAME) \