External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use __basic_json.

Browse Source
This commit is contained in:
Alexander Nevskiy 2015-07-14 00:47:38 +03:00
parent e007f02c54
commit 5ddff15c2a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/json.hpp
View File

@ -2931,8 +2931,8 @@ class basic_json
*/ */
template <class InteratorType, typename template <class InteratorType, typename
std::enable_if< std::enable_if<
std::is_same<InteratorType, typename basic_json::iterator>::value or 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::const_iterator>::value
, int>::type , int>::type
= 0> = 0>
InteratorType erase(InteratorType first, InteratorType last) InteratorType erase(InteratorType first, InteratorType last)
@ -4852,7 +4852,7 @@ class basic_json
}; };
/// an iterator value /// an iterator value
union internal_iterator struct internal_iterator
{ {
/// iterator for JSON objects /// iterator for JSON objects
typename object_t::iterator object_iterator; typename object_t::iterator object_iterator;