From f699954f4d863d83d3f6e587db23a7daf0db0ac4 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Fri, 10 Feb 2023 08:41:12 +0100
Subject: [PATCH] Remove support for `__int64` (#1820)

---
 src/ArduinoJson/Configuration.hpp                       | 6 ------
 src/ArduinoJson/Polyfills/type_traits/is_integral.hpp   | 4 ----
 src/ArduinoJson/Polyfills/type_traits/is_signed.hpp     | 5 +----
 src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp   | 3 ---
 src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp | 7 -------
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/ArduinoJson/Configuration.hpp b/src/ArduinoJson/Configuration.hpp
index ed5687a3..72a8b6e4 100644
--- a/src/ArduinoJson/Configuration.hpp
+++ b/src/ArduinoJson/Configuration.hpp
@@ -20,12 +20,6 @@
 #  endif
 #endif
 
-#if defined(_MSC_VER) && !ARDUINOJSON_HAS_LONG_LONG
-#  define ARDUINOJSON_HAS_INT64 1
-#else
-#  define ARDUINOJSON_HAS_INT64 0
-#endif
-
 // Support std::istream and std::ostream
 #ifndef ARDUINOJSON_ENABLE_STD_STREAM
 #  ifdef __has_include
diff --git a/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp b/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
index fc0da04a..97d31049 100644
--- a/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
+++ b/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
@@ -26,10 +26,6 @@ struct is_integral : integral_constant<bool,
 #if ARDUINOJSON_HAS_LONG_LONG
     is_same<typename remove_cv<T>::type, signed long long>::value ||
     is_same<typename remove_cv<T>::type, unsigned long long>::value ||
-#endif
-#if ARDUINOJSON_HAS_INT64
-    is_same<typename remove_cv<T>::type, signed __int64>::value ||
-    is_same<typename remove_cv<T>::type, unsigned __int64>::value ||
 #endif
     is_same<typename remove_cv<T>::type, char>::value ||
     is_same<typename remove_cv<T>::type, bool>::value> {};
diff --git a/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp b/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
index d6c7016a..9c4f4341 100644
--- a/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
+++ b/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
@@ -12,7 +12,7 @@ namespace ARDUINOJSON_NAMESPACE {
 
 // clang-format off
 template <typename T>
-struct is_signed : integral_constant<bool, 
+struct is_signed : integral_constant<bool,
     is_same<typename remove_cv<T>::type, char>::value ||
     is_same<typename remove_cv<T>::type, signed char>::value ||
     is_same<typename remove_cv<T>::type, signed short>::value ||
@@ -20,9 +20,6 @@ struct is_signed : integral_constant<bool,
     is_same<typename remove_cv<T>::type, signed long>::value ||
 #if ARDUINOJSON_HAS_LONG_LONG
     is_same<typename remove_cv<T>::type, signed long long>::value ||
-#endif
-#if ARDUINOJSON_HAS_INT64
-    is_same<typename remove_cv<T>::type, signed __int64>::value ||
 #endif
     is_same<typename remove_cv<T>::type, float>::value ||
     is_same<typename remove_cv<T>::type, double>::value> {};
diff --git a/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp b/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
index 84b7d051..9dfd6677 100644
--- a/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
+++ b/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
@@ -17,9 +17,6 @@ struct is_unsigned : integral_constant<bool,
     is_same<typename remove_cv<T>::type, unsigned short>::value ||
     is_same<typename remove_cv<T>::type, unsigned int>::value ||
     is_same<typename remove_cv<T>::type, unsigned long>::value ||
-#if ARDUINOJSON_HAS_INT64
-    is_same<typename remove_cv<T>::type, unsigned __int64>::value ||
-#endif
 #if ARDUINOJSON_HAS_LONG_LONG
     is_same<typename remove_cv<T>::type, unsigned long long>::value ||
 #endif
diff --git a/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp b/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
index f7fc3712..9b81071c 100644
--- a/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
+++ b/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
@@ -39,11 +39,4 @@ struct make_unsigned<signed long long> : type_identity<unsigned long long> {};
 template <>
 struct make_unsigned<unsigned long long> : type_identity<unsigned long long> {};
 #endif
-
-#if ARDUINOJSON_HAS_INT64
-template <>
-struct make_unsigned<signed __int64> : type_identity<unsigned __int64> {};
-template <>
-struct make_unsigned<unsigned __int64> : type_identity<unsigned __int64> {};
-#endif
 }  // namespace ARDUINOJSON_NAMESPACE