j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some typename fix

Browse source
This commit is contained in:
Niels 2015-04-27 23:09:51 +02:00
parent 14e54b2b72
commit faae8bb843
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -1,5 +1,5 @@
version: '{build}' version: '{build}'
os: Visual Studio 2015 CTP os: Visual Studio 2015 CTP 6
init: [] init: []
install: [] install: []
build_script: build_script:

20
src/json.hpp
View file

@ -329,10 +329,10 @@ class basic_json
/// create an array (implicit) /// create an array (implicit)
template <class V, typename template <class V, typename
std::enable_if< std::enable_if<
not std::is_same<V, basic_json::iterator>::value and not std::is_same<V, typename basic_json::iterator>::value and
not std::is_same<V, basic_json::const_iterator>::value and not std::is_same<V, typename basic_json::const_iterator>::value and
not std::is_same<V, basic_json::reverse_iterator>::value and not std::is_same<V, typename basic_json::reverse_iterator>::value and
not std::is_same<V, basic_json::const_reverse_iterator>::value and not std::is_same<V, typename basic_json::const_reverse_iterator>::value and
not std::is_same<V, typename array_t::iterator>::value and not std::is_same<V, typename array_t::iterator>::value and
not std::is_same<V, typename array_t::const_iterator>::value and not std::is_same<V, typename array_t::const_iterator>::value and
std::is_constructible<basic_json, typename V::value_type>::value, int>::type std::is_constructible<basic_json, typename V::value_type>::value, int>::type
@ -493,8 +493,8 @@ class basic_json
/// construct a JSON container given an iterator range /// construct a JSON container given an iterator range
template <class T, typename template <class T, typename
std::enable_if< std::enable_if<
std::is_same<T, basic_json::iterator>::value or std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value std::is_same<T, typename basic_json::const_iterator>::value
, int>::type , int>::type
= 0> = 0>
inline basic_json(T first, T last) inline basic_json(T first, T last)
@ -1198,8 +1198,8 @@ class basic_json
/// remove element given an iterator /// remove element given an iterator
template <class T, typename template <class T, typename
std::enable_if< std::enable_if<
std::is_same<T, basic_json::iterator>::value or std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value std::is_same<T, typename basic_json::const_iterator>::value
, int>::type , int>::type
= 0> = 0>
inline T erase(T pos) inline T erase(T pos)
@ -1258,8 +1258,8 @@ class basic_json
/// remove elements given an iterator range /// remove elements given an iterator range
template <class T, typename template <class T, typename
std::enable_if< std::enable_if<
std::is_same<T, basic_json::iterator>::value or std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value std::is_same<T, typename basic_json::const_iterator>::value
, int>::type , int>::type
= 0> = 0>
inline T erase(T first, T last) inline T erase(T first, T last)

20
src/json.hpp.re2c
View file

@ -329,10 +329,10 @@ class basic_json
/// create an array (implicit) /// create an array (implicit)
template <class V, typename template <class V, typename
std::enable_if< std::enable_if<
not std::is_same<V, basic_json::iterator>::value and not std::is_same<V, typename basic_json::iterator>::value and
not std::is_same<V, basic_json::const_iterator>::value and not std::is_same<V, typename basic_json::const_iterator>::value and
not std::is_same<V, basic_json::reverse_iterator>::value and not std::is_same<V, typename basic_json::reverse_iterator>::value and
not std::is_same<V, basic_json::const_reverse_iterator>::value and not std::is_same<V, typename basic_json::const_reverse_iterator>::value and
not std::is_same<V, typename array_t::iterator>::value and not std::is_same<V, typename array_t::iterator>::value and
not std::is_same<V, typename array_t::const_iterator>::value and not std::is_same<V, typename array_t::const_iterator>::value and
std::is_constructible<basic_json, typename V::value_type>::value, int>::type std::is_constructible<basic_json, typename V::value_type>::value, int>::type
@ -493,8 +493,8 @@ class basic_json
/// construct a JSON container given an iterator range /// construct a JSON container given an iterator range
template <class T, typename template <class T, typename
std::enable_if< std::enable_if<
std::is_same<T, basic_json::iterator>::value or std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value std::is_same<T, typename basic_json::const_iterator>::value
, int>::type , int>::type
= 0> = 0>
inline basic_json(T first, T last) inline basic_json(T first, T last)
@ -1198,8 +1198,8 @@ class basic_json
/// remove element given an iterator /// remove element given an iterator
template <class T, typename template <class T, typename
std::enable_if< std::enable_if<
std::is_same<T, basic_json::iterator>::value or std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value std::is_same<T, typename basic_json::const_iterator>::value
, int>::type , int>::type
= 0> = 0>
inline T erase(T pos) inline T erase(T pos)
@ -1258,8 +1258,8 @@ class basic_json
/// remove elements given an iterator range /// remove elements given an iterator range
template <class T, typename template <class T, typename
std::enable_if< std::enable_if<
std::is_same<T, basic_json::iterator>::value or std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value std::is_same<T, typename basic_json::const_iterator>::value
, int>::type , int>::type
= 0> = 0>
inline T erase(T first, T last) inline T erase(T first, T last)