Skip to content

samples: matter: Allow using enums as keys in the finite map #25477

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

samples: matter: Allow using enums as keys in the finite map #25477

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
15 changes: 13 additions & 2 deletions samples/matter/common/src/util/finite_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,24 @@ namespace Nrf
key.
* T2 must have move semantics and bool()/==operators implemented
*/

template <typename T, bool IsEnum> struct KeyTypeHelper {
using type = T;
};

template <typename T> struct KeyTypeHelper<T, true> {
using type = typename std::underlying_type<T>::type;
};

template <typename T1, typename T2, uint16_t N> struct FiniteMap {
static_assert(std::is_trivial_v<T1>);

static constexpr T1 kInvalidKey{ std::numeric_limits<T1>::max() };
static constexpr std::size_t kNoSlotsFound{ N + 1 };
using KeyType = typename KeyTypeHelper<T1, std::is_enum_v<T1>>::type;
using ElementCounterType = uint16_t;

static constexpr T1 kInvalidKey{ static_cast<T1>(std::numeric_limits<KeyType>::max()) };
static constexpr std::size_t kNoSlotsFound{ N + 1 };

struct Item {
/* Initialize with invalid key (0 is a valid key) */
T1 key{ kInvalidKey };
Expand Down