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

Merge branch 'develop' of https://github.com/nlohmann/json into develop

Browse source
This commit is contained in:
Niels Lohmann 2017-12-28 13:52:26 +01:00
commit d45183d426
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/json.hpp
View file

@ -3526,7 +3526,7 @@ class primitive_iterator_t
return *this;
}
primitive_iterator_t operator++(int)
primitive_iterator_t const operator++(int)
{
auto result = *this;
m_it++;
@ -3539,7 +3539,7 @@ class primitive_iterator_t
return *this;
}
primitive_iterator_t operator--(int)
primitive_iterator_t const operator--(int)
{
auto result = *this;
m_it--;
@ -3850,7 +3850,7 @@ class iter_impl
@brief post-increment (it++)
@pre The iterator is initialized; i.e. `m_object != nullptr`.
*/
iter_impl operator++(int)
iter_impl const operator++(int)
{
auto result = *this;
++(*this);
@ -3893,7 +3893,7 @@ class iter_impl
@brief post-decrement (it--)
@pre The iterator is initialized; i.e. `m_object != nullptr`.
*/
iter_impl operator--(int)
iter_impl const operator--(int)
{
auto result = *this;
--(*this);
@ -4299,7 +4299,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
/// post-increment (it++)
json_reverse_iterator operator++(int)
json_reverse_iterator const operator++(int)
{
return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
}
@ -4311,7 +4311,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
}
/// post-decrement (it--)
json_reverse_iterator operator--(int)
json_reverse_iterator const operator--(int)
{
return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
}
@ -6567,7 +6567,8 @@ class serializer
// the codepoint from the UTF-8 bytes
int codepoint = 0;
assert(0 <= bytes and bytes <= 3);
// bytes is unsigned type:
assert(bytes <= 3);
switch (bytes)
{
case 0: