Merge branch 'develop' of https://github.com/nlohmann/json into develop
diff --git a/src/json.hpp b/src/json.hpp
index 325c019..2da3990 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -3526,7 +3526,7 @@
return *this;
}
- primitive_iterator_t operator++(int)
+ primitive_iterator_t const operator++(int)
{
auto result = *this;
m_it++;
@@ -3539,7 +3539,7 @@
return *this;
}
- primitive_iterator_t operator--(int)
+ primitive_iterator_t const operator--(int)
{
auto result = *this;
m_it--;
@@ -3850,7 +3850,7 @@
@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 @@
@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 @@
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 @@
}
/// 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 @@
// 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:
