From f193427e91569419d438afa0cb1c8d5b601c52b3 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 22 Oct 2017 08:53:43 +0200 Subject: [PATCH] :hammer: some simplifications --- src/json.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 3f0b6e3e..15219be8 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -11969,7 +11969,7 @@ class basic_json 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")); } @@ -12065,8 +12065,7 @@ class basic_json } // passed iterators must belong to objects - if (JSON_UNLIKELY(not first.m_object->is_object() - or not last.m_object->is_object())) + if (JSON_UNLIKELY(not first.m_object->is_object())) { JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects")); }