From 5ddff15c2a58b8107d454ac10f5e71bac072ec4b Mon Sep 17 00:00:00 2001
From: Alexander Nevskiy <kepkin@gmail.com>
Date: Tue, 14 Jul 2015 00:47:38 +0300
Subject: [PATCH] Use __basic_json.

---
 src/json.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/json.hpp b/src/json.hpp
index 9511f02cc..269042f89 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -2931,8 +2931,8 @@ class basic_json
     */
     template <class InteratorType, typename
               std::enable_if<
-                  std::is_same<InteratorType, typename basic_json::iterator>::value or
-                  std::is_same<InteratorType, typename basic_json::const_iterator>::value
+                  std::is_same<InteratorType, typename __basic_json::iterator>::value or
+                  std::is_same<InteratorType, typename __basic_json::const_iterator>::value
                   , int>::type
               = 0>
     InteratorType erase(InteratorType first, InteratorType last)
@@ -4852,7 +4852,7 @@ class basic_json
     };
 
     /// an iterator value
-    union internal_iterator
+    struct internal_iterator
     {
         /// iterator for JSON objects
         typename object_t::iterator object_iterator;