lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

⚗️ try to use GCC 10

Browse Source
This commit is contained in:
Niels Lohmann
2020-12-29 20:16:51 +01:00
parent 7b98df515f
commit 433da31334
8 changed files with 73 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
single_include/nlohmann/json.hpp
View File

@ -11279,7 +11279,30 @@ class iter_impl
@brief comparison: equal
@pre The iterator is initialized; i.e. `m_object != nullptr`.
*/
bool operator==(const iter_impl& other) const
bool operator==(const iter_impl<const BasicJsonType>& other) const
{
// if objects are not the same, the comparison is undefined
if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
{
JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
}
JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type)
{
case value_t::object:
return (m_it.object_iterator == other.m_it.object_iterator);
case value_t::array:
return (m_it.array_iterator == other.m_it.array_iterator);
default:
return (m_it.primitive_iterator == other.m_it.primitive_iterator);
}
}
bool operator==(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) const
{
// if objects are not the same, the comparison is undefined
if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))