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

⏪ undo experimental fix for Clang 3.5

Browse Source
This commit is contained in:
Niels Lohmann 2021-07-23 10:05:22 +02:00
parent 86dd66508d
commit 5f39b09cbc
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/nlohmann/detail/meta/type_traits.hpp
View File

@ -450,18 +450,13 @@ decltype(ComparatorType()(std::declval<ObjectKeyType const&>(), std::declval<Key
static constexpr bool value = true; static constexpr bool value = true;
}; };
template<typename BasicJsonType>
class iter_impl;
template<typename BasicJsonType, typename KeyType> template<typename BasicJsonType, typename KeyType>
struct is_usable_as_key_type struct is_usable_as_key_type
{ {
static constexpr bool value = static constexpr bool value =
is_key_type_comparable<typename BasicJsonType::object_comparator_t, typename BasicJsonType::object_t::key_type, KeyType>::value && is_key_type_comparable<typename BasicJsonType::object_comparator_t, typename BasicJsonType::object_t::key_type, KeyType>::value &&
!std::is_same<KeyType, typename BasicJsonType::iterator>::value && !std::is_same<KeyType, typename BasicJsonType::iterator>::value &&
!std::is_same<KeyType, typename BasicJsonType::const_iterator>::value && !std::is_same<KeyType, typename BasicJsonType::const_iterator>::value;
// for Clang 3.5
!std::is_same<KeyType, detail::iter_impl<typename std::remove_const<BasicJsonType>::type>>::value;
}; };
} // namespace detail } // namespace detail

7
single_include/nlohmann/json.hpp
View File

@ -3847,18 +3847,13 @@ decltype(ComparatorType()(std::declval<ObjectKeyType const&>(), std::declval<Key
static constexpr bool value = true; static constexpr bool value = true;
}; };
template<typename BasicJsonType>
class iter_impl;
template<typename BasicJsonType, typename KeyType> template<typename BasicJsonType, typename KeyType>
struct is_usable_as_key_type struct is_usable_as_key_type
{ {
static constexpr bool value = static constexpr bool value =
is_key_type_comparable<typename BasicJsonType::object_comparator_t, typename BasicJsonType::object_t::key_type, KeyType>::value && is_key_type_comparable<typename BasicJsonType::object_comparator_t, typename BasicJsonType::object_t::key_type, KeyType>::value &&
!std::is_same<KeyType, typename BasicJsonType::iterator>::value && !std::is_same<KeyType, typename BasicJsonType::iterator>::value &&
!std::is_same<KeyType, typename BasicJsonType::const_iterator>::value && !std::is_same<KeyType, typename BasicJsonType::const_iterator>::value;
// for Clang 3.5
!std::is_same<KeyType, detail::iter_impl<typename std::remove_const<BasicJsonType>::type>>::value;
}; };
} // namespace detail } // namespace detail