# HG changeset patch # User David Demelier # Date 1548099571 -3600 # Node ID a0239cca29fa0035409832235d485ba3db14a086 # Parent 5f00a9691da5067e0fff10c523833ae26d93516d json_util: use std::string_view and pet doxygen diff -r 5f00a9691da5 -r a0239cca29fa cpp/json_util/json_util.hpp --- a/cpp/json_util/json_util.hpp Mon Jan 21 20:39:31 2019 +0100 +++ b/cpp/json_util/json_util.hpp Mon Jan 21 20:39:31 2019 +0100 @@ -251,6 +251,7 @@ * - Object property is not the same type * * \param key the property key + * \param def the default value * \return the object or def * \throw any exception from nlohmann::json constructor */ @@ -278,7 +279,7 @@ * \return the value, std::nullopt or def */ template - auto optional(const std::string& key, DefaultValue&& def) const noexcept -> std::optional + auto optional(std::string_view key, DefaultValue&& def) const noexcept -> std::optional { const auto it = find(key); diff -r 5f00a9691da5 -r a0239cca29fa extern/libjson/CMakeLists.txt --- a/extern/libjson/CMakeLists.txt Mon Jan 21 20:39:31 2019 +0100 +++ b/extern/libjson/CMakeLists.txt Mon Jan 21 20:39:31 2019 +0100 @@ -1,7 +1,7 @@ # # CMakeLists.txt -- CMake build system for nlohmann's json # -# Copyright (c) 2016-2018 David Demelier +# Copyright (c) 2016-2019 David Demelier # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above