1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 21:01:16 +02:00

Merge remote-tracking branch 'upstream/master' into errors-phase-2

This commit is contained in:
Ben Burdette 2020-06-11 14:06:35 -06:00
commit ef1b3f21b6
42 changed files with 261 additions and 92 deletions

View file

@ -460,8 +460,7 @@ string base64Encode(const string & s);
string base64Decode(const string & s);
/* Get a value for the specified key from an associate container, or a
default value if the key doesn't exist. */
/* Get a value for the specified key from an associate container. */
template <class T>
std::optional<typename T::mapped_type> get(const T & map, const typename T::key_type & key)
{