j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 approach to un-break the changes for #462

Browse source
This commit is contained in:
Niels Lohmann 2017-08-16 20:11:05 +02:00
parent 22b59693f1
commit aba8b58492
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/json.hpp
View file

@ -13182,6 +13182,15 @@ class basic_json
return binary_reader(i).parse_cbor(strict); return binary_reader(i).parse_cbor(strict);
} }
/*!
@copydoc from_cbor(detail::input_adapter, const bool)
*/
template<typename A1, typename A2,
detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
static basic_json from_cbor(A1&& a1, A2&& a2, const bool strict = true)
{
return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_cbor(strict);
}
/*! /*!
@brief create a JSON value from an input in MessagePack format @brief create a JSON value from an input in MessagePack format
@ -13260,6 +13269,16 @@ class basic_json
return binary_reader(i).parse_msgpack(strict); return binary_reader(i).parse_msgpack(strict);
} }
/*!
@copydoc from_msgpack(detail::input_adapter, const bool)
*/
template<typename A1, typename A2,
detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
static basic_json from_msgpack(A1&& a1, A2&& a2, const bool strict = true)
{
return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_msgpack(strict);
}
/// @} /// @}
////////////////////////// //////////////////////////

2
test/src/unit-cbor.cpp
View file

@ -1322,7 +1322,7 @@ TEST_CASE("single CBOR roundtrip")
// check with different start index // check with different start index
packed.insert(packed.begin(), 5, 0xff); packed.insert(packed.begin(), 5, 0xff);
CHECK(j1 == json::from_cbor({packed.begin() + 5, packed.end()})); CHECK(j1 == json::from_cbor(packed.begin() + 5, packed.end()));
} }
} }

2
test/src/unit-msgpack.cpp
View file

@ -1164,7 +1164,7 @@ TEST_CASE("single MessagePack roundtrip")
// check with different start index // check with different start index
packed.insert(packed.begin(), 5, 0xff); packed.insert(packed.begin(), 5, 0xff);
CHECK(j1 == json::from_msgpack({packed.begin() + 5, packed.end()})); CHECK(j1 == json::from_msgpack(packed.begin() + 5, packed.end()));
} }
} }