Commit faae8bb8 authored by Niels's avatar Niels

some typename fix

parent 14e54b2b
version: '{build}' version: '{build}'
os: Visual Studio 2015 CTP os: Visual Studio 2015 CTP 6
init: [] init: []
install: [] install: []
build_script: build_script:
......
...@@ -329,10 +329,10 @@ class basic_json ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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)
......
...@@ -329,10 +329,10 @@ class basic_json ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment