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

🔨 some simplifications

Browse source
This commit is contained in:
Niels Lohmann 2017-10-22 08:53:43 +02:00
parent 24b6e028a9
commit f193427e91
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/json.hpp
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"));
} }