nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 23:42:43 +01:00
Code Activity

More flexible typing for get in util.hh

Browse source 
This is good for e.g. `std::string_view` and `StringMap`.

Needed by #11139

Co-authored-by: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
This commit is contained in:
John Ericson 2025-05-23 15:29:55 -04:00 • committed by John Ericson
parent 22378ea093
commit 0ef818dd92
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libutil/include/nix/util/util.hh
View file

@ -196,8 +196,8 @@ std::pair<std::string_view, std::string_view> getLine(std::string_view s);
/** /**
* Get a value for the specified key from an associate container. * Get a value for the specified key from an associate container.
*/ */
template<class T> template<class T, typename K>
const typename T::mapped_type * get(const T & map, const typename T::key_type & key) const typename T::mapped_type * get(const T & map, K & key)
{ {
auto i = map.find(key); auto i = map.find(key);
if (i == map.end()) if (i == map.end())
@ -205,8 +205,8 @@ const typename T::mapped_type * get(const T & map, const typename T::key_type &
return &i->second; return &i->second;
} }
template<class T> template<class T, typename K>
typename T::mapped_type * get(T & map, const typename T::key_type & key) typename T::mapped_type * get(T & map, K & key)
{ {
auto i = map.find(key); auto i = map.find(key);
if (i == map.end()) if (i == map.end())
@ -221,9 +221,8 @@ typename T::mapped_type * get(T && map, const typename T::key_type & key) = dele
/** /**
* Get a value for the specified key from an associate container, or a default value if the key isn't present. * Get a value for the specified key from an associate container, or a default value if the key isn't present.
*/ */
template<class T> template<class T, typename K>
const typename T::mapped_type & const typename T::mapped_type & getOr(T & map, K & key, const typename T::mapped_type & defaultValue)
getOr(T & map, const typename T::key_type & key, const typename T::mapped_type & defaultValue)
{ {
auto i = map.find(key); auto i = map.find(key);
if (i == map.end()) if (i == map.end())