From 86dd66508d49b1e1890ac55a4b26f0bd6f50fc2d Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Thu, 22 Jul 2021 14:21:43 +0200
Subject: [PATCH] :alembic: add fix for Clang 3.5

---
 include/nlohmann/detail/meta/type_traits.hpp | 7 ++++++-
 single_include/nlohmann/json.hpp             | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
index e9bf81d08..5106a14ba 100644
--- a/include/nlohmann/detail/meta/type_traits.hpp
+++ b/include/nlohmann/detail/meta/type_traits.hpp
@@ -450,13 +450,18 @@ decltype(ComparatorType()(std::declval<ObjectKeyType const&>(), std::declval<Key
     static constexpr bool value = true;
 };
 
+template<typename BasicJsonType>
+class iter_impl;
+
 template<typename BasicJsonType, typename KeyType>
 struct is_usable_as_key_type
 {
     static constexpr bool 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::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
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 9c67db16d..05fa0e7af 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -3847,13 +3847,18 @@ decltype(ComparatorType()(std::declval<ObjectKeyType const&>(), std::declval<Key
     static constexpr bool value = true;
 };
 
+template<typename BasicJsonType>
+class iter_impl;
+
 template<typename BasicJsonType, typename KeyType>
 struct is_usable_as_key_type
 {
     static constexpr bool 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::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