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.hpp | |
| parent | 1484dd3aa73489cc66572f1c431e08c610e201af (diff) | |
| parent | d2e91829abc8dd46fa4685d1cab89ef6fe907471 (diff) | |
Merge pull request #62 from OpenVicProject/cleanup
Diffstat (limited to 'src/openvic-simulation/Modifier.hpp')
| -rw-r--r-- | src/openvic-simulation/Modifier.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/openvic-simulation/Modifier.hpp b/src/openvic-simulation/Modifier.hpp index c6b15a6..f936e5d 100644 --- a/src/openvic-simulation/Modifier.hpp +++ b/src/openvic-simulation/Modifier.hpp @@ -1,7 +1,5 @@ #pragma once -#include <set> - #include "openvic-simulation/types/IdentifierRegistry.hpp" namespace OpenVic { @@ -126,8 +124,8 @@ namespace OpenVic { NodeTools::node_callback_t expect_modifier_value_and_default(NodeTools::callback_t<ModifierValue&&> modifier_callback, NodeTools::key_value_callback_t default_callback) const; NodeTools::node_callback_t expect_modifier_value(NodeTools::callback_t<ModifierValue&&> modifier_callback) const; - NodeTools::node_callback_t expect_whitelisted_modifier_value_and_default(NodeTools::callback_t<ModifierValue&&> modifier_callback, std::set<std::string, std::less<void>> const& whitelist, NodeTools::key_value_callback_t default_callback) const; - NodeTools::node_callback_t expect_whitelisted_modifier_value(NodeTools::callback_t<ModifierValue&&> modifier_callback, std::set<std::string, std::less<void>> const& whitelist) const; + NodeTools::node_callback_t expect_whitelisted_modifier_value_and_default(NodeTools::callback_t<ModifierValue&&> modifier_callback, string_set_t const& whitelist, NodeTools::key_value_callback_t default_callback) const; + NodeTools::node_callback_t expect_whitelisted_modifier_value(NodeTools::callback_t<ModifierValue&&> modifier_callback, string_set_t const& whitelist) const; NodeTools::node_callback_t expect_modifier_value_and_key_map_and_default(NodeTools::callback_t<ModifierValue&&> modifier_callback, NodeTools::key_value_callback_t default_callback, NodeTools::key_map_t&& key_map) const; NodeTools::node_callback_t expect_modifier_value_and_key_map(NodeTools::callback_t<ModifierValue&&> modifier_callback, NodeTools::key_map_t&& key_map) const; |