wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-09 16:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔨 some simplifications

Browse Source
This commit is contained in:
Niels Lohmann committed 2017-10-22 08:53:43 +02:00
1 parent 24b6e028a9
commit f193427e91
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/json.hpp
+2 -3
View File
@@ -11969,7 +11969,7 @@ class basic_json
JSON_THROW(invalid_iterator::create(210, "iterators do not fit")); JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
} }
if (JSON_UNLIKELY(first.m_object == this or last.m_object == this)) if (JSON_UNLIKELY(first.m_object == this))
{ {
JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container")); JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
} }
@@ -12065,8 +12065,7 @@ class basic_json
} }
// passed iterators must belong to objects // passed iterators must belong to objects
if (JSON_UNLIKELY(not first.m_object->is_object() if (JSON_UNLIKELY(not first.m_object->is_object()))
or not last.m_object->is_object()))
{ {
JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects")); JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
} }