haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup

Browse source
This commit is contained in:
Niels 2016-06-07 00:20:53 +02:00
parent 04e1e7b586
commit 9e2dfd19e8
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/json.hpp
View file

@ -1461,13 +1461,13 @@ class basic_json
@since version 2.0.0 @since version 2.0.0
*/ */
template < typename CompatibleNumberUnsignedType, typename template <typename CompatibleNumberUnsignedType, typename
std::enable_if < std::enable_if <
std::is_constructible<number_unsigned_t, CompatibleNumberUnsignedType>::value and std::is_constructible<number_unsigned_t, CompatibleNumberUnsignedType>::value and
std::numeric_limits<CompatibleNumberUnsignedType>::is_integer and std::numeric_limits<CompatibleNumberUnsignedType>::is_integer and
!std::numeric_limits<CompatibleNumberUnsignedType>::is_signed, not std::numeric_limits<CompatibleNumberUnsignedType>::is_signed,
CompatibleNumberUnsignedType >::type CompatibleNumberUnsignedType>::type
= 0 > = 0>
basic_json(const CompatibleNumberUnsignedType val) noexcept basic_json(const CompatibleNumberUnsignedType val) noexcept
: m_type(value_t::number_unsigned), : m_type(value_t::number_unsigned),
m_value(static_cast<number_unsigned_t>(val)) m_value(static_cast<number_unsigned_t>(val))
@ -5079,6 +5079,7 @@ class basic_json
throw std::domain_error("iterator does not fit current value"); throw std::domain_error("iterator does not fit current value");
} }
// check if range iterators belong to the same JSON object
if (first.m_object != last.m_object) if (first.m_object != last.m_object)
{ {
throw std::domain_error("iterators do not fit"); throw std::domain_error("iterators do not fit");
@ -7332,7 +7333,7 @@ class basic_json
@return string representation of the code point @return string representation of the code point
@throw std::out_of_range if code point is >0x10ffff; example: `"code @throw std::out_of_range if code point is > 0x10ffff; example: `"code
points above 0x10FFFF are invalid"` points above 0x10FFFF are invalid"`
@throw std::invalid_argument if the low surrogate is invalid; example: @throw std::invalid_argument if the low surrogate is invalid; example:
`""missing or wrong low surrogate""` `""missing or wrong low surrogate""`

17
src/json.hpp.re2c
View file

@ -1461,13 +1461,13 @@ class basic_json
@since version 2.0.0 @since version 2.0.0
*/ */
template < typename CompatibleNumberUnsignedType, typename template <typename CompatibleNumberUnsignedType, typename
std::enable_if < std::enable_if <
std::is_constructible<number_unsigned_t, CompatibleNumberUnsignedType>::value and std::is_constructible<number_unsigned_t, CompatibleNumberUnsignedType>::value and
std::numeric_limits<CompatibleNumberUnsignedType>::is_integer and std::numeric_limits<CompatibleNumberUnsignedType>::is_integer and
!std::numeric_limits<CompatibleNumberUnsignedType>::is_signed, not std::numeric_limits<CompatibleNumberUnsignedType>::is_signed,
CompatibleNumberUnsignedType >::type CompatibleNumberUnsignedType>::type
= 0 > = 0>
basic_json(const CompatibleNumberUnsignedType val) noexcept basic_json(const CompatibleNumberUnsignedType val) noexcept
: m_type(value_t::number_unsigned), : m_type(value_t::number_unsigned),
m_value(static_cast<number_unsigned_t>(val)) m_value(static_cast<number_unsigned_t>(val))
@ -5079,6 +5079,7 @@ class basic_json
throw std::domain_error("iterator does not fit current value"); throw std::domain_error("iterator does not fit current value");
} }
// check if range iterators belong to the same JSON object
if (first.m_object != last.m_object) if (first.m_object != last.m_object)
{ {
throw std::domain_error("iterators do not fit"); throw std::domain_error("iterators do not fit");
@ -7332,7 +7333,7 @@ class basic_json
@return string representation of the code point @return string representation of the code point
@throw std::out_of_range if code point is >0x10ffff; example: `"code @throw std::out_of_range if code point is > 0x10ffff; example: `"code
points above 0x10FFFF are invalid"` points above 0x10FFFF are invalid"`
@throw std::invalid_argument if the low surrogate is invalid; example: @throw std::invalid_argument if the low surrogate is invalid; example:
`""missing or wrong low surrogate""` `""missing or wrong low surrogate""`