mirror of
https://github.com/nlohmann/json.git
synced 2026-11-21 18:32:40 +00:00
Write the std::u8string from_json template header in the compact form
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
2 files changed
+4
-4
No files matched your search
@@ -788,8 +788,8 @@ void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyE
|
|||||||
#if defined(__cpp_lib_char8_t)
|
#if defined(__cpp_lib_char8_t)
|
||||||
// a std::u8string is read from a JSON string; the array of code units written by
|
// a std::u8string is read from a JSON string; the array of code units written by
|
||||||
// versions before 3.13.0 is still accepted
|
// versions before 3.13.0 is still accepted
|
||||||
template < typename BasicJsonType, typename Tr, typename Allocator,
|
template<typename BasicJsonType, typename Tr, typename Allocator,
|
||||||
enable_if_t < std::is_same<typename json_type_of_t<BasicJsonType>::string_t::value_type, char>::value, int > = 0 >
|
enable_if_t<std::is_same<typename json_type_of_t<BasicJsonType>::string_t::value_type, char>::value, int> = 0>
|
||||||
inline void from_json(const BasicJsonType& j, std::basic_string<char8_t, Tr, Allocator>& s)
|
inline void from_json(const BasicJsonType& j, std::basic_string<char8_t, Tr, Allocator>& s)
|
||||||
{
|
{
|
||||||
if (j.is_string())
|
if (j.is_string())
|
||||||
|
|||||||
Generated
+2
-2
@@ -6931,8 +6931,8 @@ void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyE
|
|||||||
#if defined(__cpp_lib_char8_t)
|
#if defined(__cpp_lib_char8_t)
|
||||||
// a std::u8string is read from a JSON string; the array of code units written by
|
// a std::u8string is read from a JSON string; the array of code units written by
|
||||||
// versions before 3.13.0 is still accepted
|
// versions before 3.13.0 is still accepted
|
||||||
template < typename BasicJsonType, typename Tr, typename Allocator,
|
template<typename BasicJsonType, typename Tr, typename Allocator,
|
||||||
enable_if_t < std::is_same<typename json_type_of_t<BasicJsonType>::string_t::value_type, char>::value, int > = 0 >
|
enable_if_t<std::is_same<typename json_type_of_t<BasicJsonType>::string_t::value_type, char>::value, int> = 0>
|
||||||
inline void from_json(const BasicJsonType& j, std::basic_string<char8_t, Tr, Allocator>& s)
|
inline void from_json(const BasicJsonType& j, std::basic_string<char8_t, Tr, Allocator>& s)
|
||||||
{
|
{
|
||||||
if (j.is_string())
|
if (j.is_string())
|
||||||
|
|||||||
Reference in new issue
Block a user