External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

👌 address review comments

Browse Source
This commit is contained in:
Niels Lohmann 2021-11-23 20:51:56 +01:00
parent 0eac6b3d3a
commit 47b9b7e927
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/nlohmann/json.hpp
View File

@ -3893,12 +3893,21 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
@brief overload for a default value of type const char* @brief overload for a default value of type const char*
@copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
*/ */
#if defined(JSON_HAS_CPP_17) // avoid creating a string_t value from default_value
template < class KeyType, typename detail::enable_if_t <
detail::is_usable_as_key_type<basic_json_t, KeyType>::value, int> = 0>
std::string_view value(const KeyType& key, const char* default_value) const
{
return value(key, std::string_view(default_value));
}
#else
template < class KeyType, typename detail::enable_if_t < template < class KeyType, typename detail::enable_if_t <
detail::is_usable_as_key_type<basic_json_t, KeyType>::value, int> = 0> detail::is_usable_as_key_type<basic_json_t, KeyType>::value, int> = 0>
string_t value(const KeyType& key, const char* default_value) const string_t value(const KeyType& key, const char* default_value) const
{ {
return value(key, string_t(default_value)); return value(key, string_t(default_value));
} }
#endif
/*! /*!
@brief access specified object element via JSON Pointer with default value @brief access specified object element via JSON Pointer with default value

9
single_include/nlohmann/json.hpp
View File

@ -21460,12 +21460,21 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
@brief overload for a default value of type const char* @brief overload for a default value of type const char*
@copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
*/ */
#if defined(JSON_HAS_CPP_17) // avoid creating a string_t value from default_value
template < class KeyType, typename detail::enable_if_t <
detail::is_usable_as_key_type<basic_json_t, KeyType>::value, int> = 0>
std::string_view value(const KeyType& key, const char* default_value) const
{
return value(key, std::string_view(default_value));
}
#else
template < class KeyType, typename detail::enable_if_t < template < class KeyType, typename detail::enable_if_t <
detail::is_usable_as_key_type<basic_json_t, KeyType>::value, int> = 0> detail::is_usable_as_key_type<basic_json_t, KeyType>::value, int> = 0>
string_t value(const KeyType& key, const char* default_value) const string_t value(const KeyType& key, const char* default_value) const
{ {
return value(key, string_t(default_value)); return value(key, string_t(default_value));
} }
#endif
/*! /*!
@brief access specified object element via JSON Pointer with default value @brief access specified object element via JSON Pointer with default value