using std::advance where possible

52cbda80 · Niels · a0609b2d · 52cbda80 · 52cbda80
Commit 52cbda80 authored Jun 29, 2016 by Niels
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

json.hpp src/json.hpp +6 -6

json.hpp.re2c src/json.hpp.re2c +6 -6

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -6606,13 +6606,13 @@ class basic_json
            {
                case basic_json::value_t::object:
                {
-                    ++m_it.object_iterator;
+                    std::advance(m_it.object_iterator, 1);
                    break;
                }
                case basic_json::value_t::array:
                {
-                    ++m_it.array_iterator;
+                    std::advance(m_it.array_iterator, 1);
                    break;
                }
@@ -6643,13 +6643,13 @@ class basic_json
            {
                case basic_json::value_t::object:
                {
-                    --m_it.object_iterator;
+                    std::advance(m_it.object_iterator, -1);
                    break;
                }
                case basic_json::value_t::array:
                {
-                    --m_it.array_iterator;
+                    std::advance(m_it.array_iterator, -1);
                    break;
                }
@@ -6761,7 +6761,7 @@ class basic_json
                case basic_json::value_t::array:
                {
-                    m_it.array_iterator += i;
+                    std::advance(m_it.array_iterator, i);
                    break;
                }
@@ -6835,7 +6835,7 @@ class basic_json
                case basic_json::value_t::array:
                {
-                    return *(m_it.array_iterator + n);
+                    return *std::next(m_it.array_iterator, n);
                }
                case basic_json::value_t::null:

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -6606,13 +6606,13 @@ class basic_json
            {
                case basic_json::value_t::object:
                {
-                    ++m_it.object_iterator;
+                    std::advance(m_it.object_iterator, 1);
                    break;
                }
                case basic_json::value_t::array:
                {
-                    ++m_it.array_iterator;
+                    std::advance(m_it.array_iterator, 1);
                    break;
                }
@@ -6643,13 +6643,13 @@ class basic_json
            {
                case basic_json::value_t::object:
                {
-                    --m_it.object_iterator;
+                    std::advance(m_it.object_iterator, -1);
                    break;
                }
                case basic_json::value_t::array:
                {
-                    --m_it.array_iterator;
+                    std::advance(m_it.array_iterator, -1);
                    break;
                }
@@ -6761,7 +6761,7 @@ class basic_json
                case basic_json::value_t::array:
                {
-                    m_it.array_iterator += i;
+                    std::advance(m_it.array_iterator, i);
                    break;
                }
@@ -6835,7 +6835,7 @@ class basic_json
                case basic_json::value_t::array:
                {
-                    return *(m_it.array_iterator + n);
+                    return *std::next(m_it.array_iterator, n);
                }
                case basic_json::value_t::null: