Skip to content

Force typed indices for IndexedFlatMap #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wvpm merged 1 commit into from
Nov 24, 2025
Merged

Force typed indices for IndexedFlatMap #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions src/openvic-simulation/types/IdentifierRegistry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "openvic-simulation/utility/Concepts.hpp"
#include "openvic-simulation/utility/Getters.hpp"
#include "openvic-simulation/utility/Logger.hpp"
#include "openvic-simulation/utility/Concepts.hpp"

namespace OpenVic {
/* Callbacks for trying to add duplicate keys via UniqueKeyRegistry::add_item */
Expand Down Expand Up @@ -176,17 +175,6 @@ namespace OpenVic {
using StorageInfo = _StorageInfo<item_type>;
using internal_storage_index_type = typename StorageInfo::index_type;
using identifier_index_map_t = template_string_map_t<internal_storage_index_type, Case>;

//helper to avoid error 'index_t': is not a member of external_value_type
template<typename EXTERNAL_VALUE_TYPE, typename = void>
struct get_index_t {
using type = std::size_t;
};

template<has_index EXTERNAL_VALUE_TYPE>
struct get_index_t<EXTERNAL_VALUE_TYPE, std::void_t<typename EXTERNAL_VALUE_TYPE::index_t>> {
using type = typename EXTERNAL_VALUE_TYPE::index_t;
};

public:
using storage_type = typename StorageInfo::storage_type;
Expand Down Expand Up @@ -372,10 +360,7 @@ namespace OpenVic {
return nullptr; \
} \
constexpr external_value_type CONST* get_item_by_index(const index_t typed_index) CONST { \
std::size_t index; \
if constexpr (std::is_same_v<index_t, std::size_t>) { \
index = typed_index; \
} else { index = type_safe::get(typed_index); } \
const std::size_t index = get_index_as_size_t(typed_index); \
if (index < 0 || index >= items.size()) { \
return nullptr; \
} \
Expand Down
Loading