Skip to content

Commit

Permalink
some typename fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@nlohmann
nlohmann committed Apr 27, 2015
1 parent 14e54b2 commit faae8bb
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: '{build}'
os: Visual Studio 2015 CTP
os: Visual Studio 2015 CTP 6
init: []
install: []
build_script:
Expand Down
20 changes: 10 additions & 10 deletions src/json.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,10 @@ class basic_json
/// create an array (implicit)
template <class V, typename
std::enable_if<
not std::is_same<V, basic_json::iterator>::value and
not std::is_same<V, basic_json::const_iterator>::value and
not std::is_same<V, 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::iterator>::value and
not std::is_same<V, typename basic_json::const_iterator>::value and
not std::is_same<V, typename basic_json::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::const_iterator>::value and
std::is_constructible<basic_json, typename V::value_type>::value, int>::type
Expand Down Expand Up @@ -493,8 +493,8 @@ class basic_json
/// construct a JSON container given an iterator range
template <class T, typename
std::enable_if<
std::is_same<T, basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value
std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, typename basic_json::const_iterator>::value
, int>::type
= 0>
inline basic_json(T first, T last)
Expand Down Expand Up @@ -1198,8 +1198,8 @@ class basic_json
/// remove element given an iterator
template <class T, typename
std::enable_if<
std::is_same<T, basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value
std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, typename basic_json::const_iterator>::value
, int>::type
= 0>
inline T erase(T pos)
Expand Down Expand Up @@ -1258,8 +1258,8 @@ class basic_json
/// remove elements given an iterator range
template <class T, typename
std::enable_if<
std::is_same<T, basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value
std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, typename basic_json::const_iterator>::value
, int>::type
= 0>
inline T erase(T first, T last)
Expand Down
20 changes: 10 additions & 10 deletions src/json.hpp.re2c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,10 @@ class basic_json
/// create an array (implicit)
template <class V, typename
std::enable_if<
not std::is_same<V, basic_json::iterator>::value and
not std::is_same<V, basic_json::const_iterator>::value and
not std::is_same<V, 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::iterator>::value and
not std::is_same<V, typename basic_json::const_iterator>::value and
not std::is_same<V, typename basic_json::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::const_iterator>::value and
std::is_constructible<basic_json, typename V::value_type>::value, int>::type
Expand Down Expand Up @@ -493,8 +493,8 @@ class basic_json
/// construct a JSON container given an iterator range
template <class T, typename
std::enable_if<
std::is_same<T, basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value
std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, typename basic_json::const_iterator>::value
, int>::type
= 0>
inline basic_json(T first, T last)
Expand Down Expand Up @@ -1198,8 +1198,8 @@ class basic_json
/// remove element given an iterator
template <class T, typename
std::enable_if<
std::is_same<T, basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value
std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, typename basic_json::const_iterator>::value
, int>::type
= 0>
inline T erase(T pos)
Expand Down Expand Up @@ -1258,8 +1258,8 @@ class basic_json
/// remove elements given an iterator range
template <class T, typename
std::enable_if<
std::is_same<T, basic_json::iterator>::value or
std::is_same<T, basic_json::const_iterator>::value
std::is_same<T, typename basic_json::iterator>::value or
std::is_same<T, typename basic_json::const_iterator>::value
, int>::type
= 0>
inline T erase(T first, T last)
Expand Down

0 comments on commit faae8bb

Please sign in to comment.