diff options
| author |   George L. Albany <Megacake1234@gmail.com> | 2023-10-20 10:42:00 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-10-20 10:42:00 +0200 |
| commit | 910d6cd73d7b1857ff481e1af060e780ec27d800 (patch) | |
| tree | 3a3c32d8f631fefda101ec3b47147da3bb81e297 /src/openvic-simulation/Modifier.cpp | |
| parent | 1484dd3aa73489cc66572f1c431e08c610e201af (diff) | |
| parent | d2e91829abc8dd46fa4685d1cab89ef6fe907471 (diff) | |
Merge pull request #62 from OpenVicProject/cleanup
Diffstat (limited to 'src/openvic-simulation/Modifier.cpp')
| -rw-r--r-- | src/openvic-simulation/Modifier.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/Modifier.cpp b/src/openvic-simulation/Modifier.cpp index 912b805..d0f3a69 100644 --- a/src/openvic-simulation/Modifier.cpp +++ b/src/openvic-simulation/Modifier.cpp @@ -299,13 +299,13 @@ node_callback_t ModifierManager::expect_modifier_value(callback_t<ModifierValue& return expect_modifier_value_and_default(modifier_callback, key_value_invalid_callback); } -node_callback_t ModifierManager::expect_whitelisted_modifier_value_and_default(callback_t<ModifierValue&&> modifier_callback, std::set<std::string, std::less<void>> const& whitelist, key_value_callback_t default_callback) const { +node_callback_t ModifierManager::expect_whitelisted_modifier_value_and_default(callback_t<ModifierValue&&> modifier_callback, string_set_t const& whitelist, key_value_callback_t default_callback) const { return expect_validated_modifier_value_and_default(modifier_callback, default_callback, [&whitelist](ModifierEffect const& effect) -> bool { return whitelist.contains(effect.get_identifier()); }); } -node_callback_t ModifierManager::expect_whitelisted_modifier_value(callback_t<ModifierValue&&> modifier_callback, std::set<std::string, std::less<void>> const& whitelist) const { +node_callback_t ModifierManager::expect_whitelisted_modifier_value(callback_t<ModifierValue&&> modifier_callback, string_set_t const& whitelist) const { return expect_whitelisted_modifier_value_and_default(modifier_callback, whitelist, key_value_invalid_callback); } |