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/pop/Culture.cpp | |
| parent | 1484dd3aa73489cc66572f1c431e08c610e201af (diff) | |
| parent | d2e91829abc8dd46fa4685d1cab89ef6fe907471 (diff) | |
Merge pull request #62 from OpenVicProject/cleanup
Diffstat (limited to 'src/openvic-simulation/pop/Culture.cpp')
| -rw-r--r-- | src/openvic-simulation/pop/Culture.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/openvic-simulation/pop/Culture.cpp b/src/openvic-simulation/pop/Culture.cpp index bbfa35a..85c96a0 100644 --- a/src/openvic-simulation/pop/Culture.cpp +++ b/src/openvic-simulation/pop/Culture.cpp @@ -1,7 +1,5 @@ #include "Culture.hpp" -#include <set> - #include "openvic-simulation/dataloader/NodeTools.hpp" using namespace OpenVic; @@ -121,7 +119,7 @@ bool CultureManager::_load_culture_group(size_t& total_expected_cultures, bool ret = expect_dictionary_keys_and_default( increment_callback(total_expected_cultures), "leader", ONE_EXACTLY, expect_identifier(assign_variable_callback(leader)), - "unit", ZERO_OR_ONE, expect_identifier(expect_graphical_culture_type_identifier(assign_variable_callback_pointer(unit_graphical_culture_type))), + "unit", ZERO_OR_ONE, expect_graphical_culture_type_identifier(assign_variable_callback_pointer(unit_graphical_culture_type)), "union", ZERO_OR_ONE, success_callback, "is_overseas", ZERO_OR_ONE, expect_bool(assign_variable_callback(is_overseas)) )(culture_group_node); @@ -193,7 +191,7 @@ bool CultureManager::load_culture_file(ast::NodeCPtr root) { CultureGroup const* culture_group = get_culture_group_by_identifier(culture_group_key); return expect_dictionary( [this, culture_group](std::string_view key, ast::NodeCPtr value) -> bool { - static const std::set<std::string, std::less<void>> reserved_keys = { + static const string_set_t reserved_keys = { "leader", "unit", "union", "is_overseas" }; if (reserved_keys.find(key) != reserved_keys.end()) return true; |