github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 00:32:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for __int64 (#1820)

Browse Source
This commit is contained in:
Benoit Blanchon
2023-02-10 08:41:12 +01:00
parent 407fc2cd45
commit f699954f4d
5 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ArduinoJson/Configuration.hpp
View File

@@ -20,12 +20,6 @@
# endif # endif
#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 // Support std::istream and std::ostream
#ifndef ARDUINOJSON_ENABLE_STD_STREAM #ifndef ARDUINOJSON_ENABLE_STD_STREAM
# ifdef __has_include # ifdef __has_include

4
src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
View File

@@ -26,10 +26,6 @@ struct is_integral : integral_constant<bool,
#if ARDUINOJSON_HAS_LONG_LONG #if ARDUINOJSON_HAS_LONG_LONG
is_same<typename remove_cv<T>::type, signed long long>::value || is_same<typename remove_cv<T>::type, signed long long>::value ||
is_same<typename remove_cv<T>::type, unsigned 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 #endif
is_same<typename remove_cv<T>::type, char>::value || is_same<typename remove_cv<T>::type, char>::value ||
is_same<typename remove_cv<T>::type, bool>::value> {}; is_same<typename remove_cv<T>::type, bool>::value> {};

5
src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
View File

@@ -12,7 +12,7 @@ namespace ARDUINOJSON_NAMESPACE {
// clang-format off // clang-format off
template <typename T> 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, char>::value ||
is_same<typename remove_cv<T>::type, signed char>::value || is_same<typename remove_cv<T>::type, signed char>::value ||
is_same<typename remove_cv<T>::type, signed short>::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 || is_same<typename remove_cv<T>::type, signed long>::value ||
#if ARDUINOJSON_HAS_LONG_LONG #if ARDUINOJSON_HAS_LONG_LONG
is_same<typename remove_cv<T>::type, signed long long>::value || 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 #endif
is_same<typename remove_cv<T>::type, float>::value || is_same<typename remove_cv<T>::type, float>::value ||
is_same<typename remove_cv<T>::type, double>::value> {}; is_same<typename remove_cv<T>::type, double>::value> {};

3
src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
View File

@@ -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 short>::value ||
is_same<typename remove_cv<T>::type, unsigned int>::value || is_same<typename remove_cv<T>::type, unsigned int>::value ||
is_same<typename remove_cv<T>::type, unsigned long>::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 #if ARDUINOJSON_HAS_LONG_LONG
is_same<typename remove_cv<T>::type, unsigned long long>::value || is_same<typename remove_cv<T>::type, unsigned long long>::value ||
#endif #endif

7
src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
View File

@@ -39,11 +39,4 @@ struct make_unsigned<signed long long> : type_identity<unsigned long long> {};
template <> template <>
struct make_unsigned<unsigned long long> : type_identity<unsigned long long> {}; struct make_unsigned<unsigned long long> : type_identity<unsigned long long> {};
#endif #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 } // namespace ARDUINOJSON_NAMESPACE