some simplifications

2dd94dd9 · Niels · f03c6ce4 · 2dd94dd9 · 2dd94dd9
Commit 2dd94dd9 authored Apr 12, 2015 by Niels
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 16 deletions

json.hpp src/json.hpp +4 -8

json.hpp.re2c src/json.hpp.re2c +4 -8

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -1498,9 +1498,7 @@ class basic_json
    */
    inline const_iterator begin() const noexcept
    {
-        const_iterator result(this);
+        return cbegin();
-        result.set_begin();
-        return result;
    }
    /*!
@@ -1531,9 +1529,7 @@ class basic_json
    */
    inline const_iterator end() const noexcept
    {
-        const_iterator result(this);
+        return cend();
-        result.set_end();
-        return result;
    }
    /*!
@@ -1562,7 +1558,7 @@ class basic_json
    */
    inline const_reverse_iterator rbegin() const noexcept
    {
-        return const_reverse_iterator(end());
+        return crbegin();
    }
    /*!
@@ -1580,7 +1576,7 @@ class basic_json
    */
    inline const_reverse_iterator rend() const noexcept
    {
-        return const_reverse_iterator(begin());
+        return crend();
    }
    /*!

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -1498,9 +1498,7 @@ class basic_json
    */
    inline const_iterator begin() const noexcept
    {
-        const_iterator result(this);
+        return cbegin();
-        result.set_begin();
-        return result;
    }
    /*!
@@ -1531,9 +1529,7 @@ class basic_json
    */
    inline const_iterator end() const noexcept
    {
-        const_iterator result(this);
+        return cend();
-        result.set_end();
-        return result;
    }
    /*!
@@ -1562,7 +1558,7 @@ class basic_json
    */
    inline const_reverse_iterator rbegin() const noexcept
    {
-        return const_reverse_iterator(end());
+        return crbegin();
    }
    /*!
@@ -1580,7 +1576,7 @@ class basic_json
    */
    inline const_reverse_iterator rend() const noexcept
    {
-        return const_reverse_iterator(begin());
+        return crend();
    }
    /*!