From ab696e8469b1417b69d6b3aa5d46a69d370613a0 Mon Sep 17 00:00:00 2001 From: hop311 Date: Fri, 20 Oct 2023 07:39:37 +0100 Subject: Minor cleanup --- src/openvic-simulation/Modifier.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/openvic-simulation/Modifier.hpp') 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 - #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 modifier_callback, NodeTools::key_value_callback_t default_callback) const; NodeTools::node_callback_t expect_modifier_value(NodeTools::callback_t modifier_callback) const; - NodeTools::node_callback_t expect_whitelisted_modifier_value_and_default(NodeTools::callback_t modifier_callback, std::set> const& whitelist, NodeTools::key_value_callback_t default_callback) const; - NodeTools::node_callback_t expect_whitelisted_modifier_value(NodeTools::callback_t modifier_callback, std::set> const& whitelist) const; + NodeTools::node_callback_t expect_whitelisted_modifier_value_and_default(NodeTools::callback_t 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 modifier_callback, string_set_t const& whitelist) const; NodeTools::node_callback_t expect_modifier_value_and_key_map_and_default(NodeTools::callback_t 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 modifier_callback, NodeTools::key_map_t&& key_map) const; -- cgit v1.2.3-56-ga3b1