From 67ce4d862bcbef365e94d61d60144465944d0f85 Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Tue, 17 Oct 2017 17:48:04 +0200
Subject: [PATCH] One more fix of the preceding commit.
---
xs/src/libslic3r/Config.hpp | 8 ++++----
xs/src/libslic3r/PrintConfig.hpp | 2 +-
2 files changed, 5 insertions(+), 5 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"; }
};
}
diff --git a/xs/src/libslic3r/PrintConfig.hpp b/xs/src/libslic3r/PrintConfig.hpp
index a62944881..18beeff6f 100644
--- a/xs/src/libslic3r/PrintConfig.hpp
+++ b/xs/src/libslic3r/PrintConfig.hpp
@@ -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) \