Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2017-10-17 18:48:04 +0300
committerbubnikv <bubnikv@gmail.com>2017-10-17 18:48:04 +0300
commit67ce4d862bcbef365e94d61d60144465944d0f85 (patch)
treec6319d6bd148c62944d8b7b1c90506ec721c57c0 /xs/src/libslic3r/Config.hpp
parent38aca5047fb1517454ea74ed3e37a1eb80f53bed (diff)
One more fix of the preceding commit.
Diffstat (limited to 'xs/src/libslic3r/Config.hpp')
-rw-r--r--xs/src/libslic3r/Config.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/xs/src/libslic3r/Config.hpp b/xs/src/libslic3r/Config.hpp
index 6e5c92123..7d76487c1 100644
--- a/xs/src/libslic3r/Config.hpp
+++ b/xs/src/libslic3r/Config.hpp
@@ -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"; }
};
}