more on #48: allowing non-std begin/end functions

nlohmann · Mar 24, 2015 · e318889 · e318889
1 parent 6fc52f3
commit e318889
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -411,7 +411,9 @@ class basic_json
     {
         Allocator<object_t> alloc;
         m_value.object = alloc.allocate(1);
-        alloc.construct(m_value.object, std::begin(value), std::end(value));
+        using std::begin;
+        using std::end;
+        alloc.construct(m_value.object, begin(value), end(value));
     }
 
     /// create an array (explicit)
@@ -439,7 +441,9 @@ class basic_json
     {
         Allocator<array_t> alloc;
         m_value.array = alloc.allocate(1);
-        alloc.construct(m_value.array, std::begin(value), std::end(value));
+        using std::begin;
+        using std::end;
+        alloc.construct(m_value.array, begin(value), end(value));
     }
 
     /// create a string (explicit)

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -411,7 +411,9 @@ class basic_json
     {
         Allocator<object_t> alloc;
         m_value.object = alloc.allocate(1);
-        alloc.construct(m_value.object, std::begin(value), std::end(value));
+        using std::begin;
+        using std::end;
+        alloc.construct(m_value.object, begin(value), end(value));
     }
 
     /// create an array (explicit)
@@ -439,7 +441,9 @@ class basic_json
     {
         Allocator<array_t> alloc;
         m_value.array = alloc.allocate(1);
-        alloc.construct(m_value.array, std::begin(value), std::end(value));
+        using std::begin;
+        using std::end;
+        alloc.construct(m_value.array, begin(value), end(value));
     }
 
     /// create a string (explicit)