mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 16:14:11 +01:00 
			
		
		
		
	Remove ARDUINOJSON_HAS_NULLPTR (#1820)
				
					
				
			This commit is contained in:
		| @@ -4,14 +4,6 @@ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #ifndef ARDUINOJSON_HAS_NULLPTR | ||||
| #  if __cplusplus >= 201103L | ||||
| #    define ARDUINOJSON_HAS_NULLPTR 1 | ||||
| #  else | ||||
| #    define ARDUINOJSON_HAS_NULLPTR 0 | ||||
| #  endif | ||||
| #endif | ||||
|  | ||||
| // Support std::istream and std::ostream | ||||
| #ifndef ARDUINOJSON_ENABLE_STD_STREAM | ||||
| #  ifdef __has_include | ||||
| @@ -215,7 +207,7 @@ | ||||
| #  endif | ||||
| #endif | ||||
|  | ||||
| #if ARDUINOJSON_HAS_NULLPTR && defined(nullptr) | ||||
| #if defined(nullptr) | ||||
| #  error nullptr is defined as a macro. Remove the faulty #define or #undef nullptr | ||||
| // See https://github.com/bblanchon/ArduinoJson/issues/1355 | ||||
| #endif | ||||
|   | ||||
| @@ -181,8 +181,6 @@ struct Converter<SerializedValue<T>, | ||||
|   } | ||||
| }; | ||||
|  | ||||
| #if ARDUINOJSON_HAS_NULLPTR | ||||
|  | ||||
| template <> | ||||
| struct Converter<decltype(nullptr)> : private VariantAttorney { | ||||
|   static void toJson(decltype(nullptr), JsonVariant dst) { | ||||
| @@ -197,8 +195,6 @@ struct Converter<decltype(nullptr)> : private VariantAttorney { | ||||
|   } | ||||
| }; | ||||
|  | ||||
| #endif | ||||
|  | ||||
| #if ARDUINOJSON_ENABLE_ARDUINO_STREAM | ||||
|  | ||||
| class MemoryPoolPrint : public Print { | ||||
|   | ||||
| @@ -75,12 +75,10 @@ struct NullComparer : ComparerBase { | ||||
|   } | ||||
| }; | ||||
|  | ||||
| #if ARDUINOJSON_HAS_NULLPTR | ||||
| template <> | ||||
| struct Comparer<decltype(nullptr), void> : NullComparer { | ||||
|   explicit Comparer(decltype(nullptr)) : NullComparer() {} | ||||
| }; | ||||
| #endif | ||||
|  | ||||
| struct ArrayComparer : ComparerBase { | ||||
|   const CollectionData* _rhs; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user