From 789986a05bd03935f1c344dc03ffaff36c8e7cdb Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 12 May 2021 09:26:23 +0200 Subject: Make ArduinoJson work with MSP430 headers --- .../ArduinoJson/Deserialization/DeserializationError.hpp | 6 +++--- include/lib/ArduinoJson/Deserialization/Filter.hpp | 2 +- include/lib/ArduinoJson/Deserialization/NestingLimit.hpp | 4 ++-- include/lib/ArduinoJson/Deserialization/Reader.hpp | 16 ++++++++-------- .../ArduinoJson/Deserialization/Readers/RamReader.hpp | 2 +- .../Deserialization/Readers/VariantReader.hpp | 4 ++-- include/lib/ArduinoJson/Deserialization/deserialize.hpp | 10 +++++----- 7 files changed, 22 insertions(+), 22 deletions(-) (limited to 'include/lib/ArduinoJson/Deserialization') diff --git a/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp b/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp index 7b61711..15fafc1 100644 --- a/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp +++ b/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp @@ -4,9 +4,9 @@ #pragma once -#include -#include -#include +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/preprocessor.hpp" +#include "lib/ArduinoJson/Polyfills/static_array.hpp" #if ARDUINOJSON_ENABLE_STD_STREAM #include diff --git a/include/lib/ArduinoJson/Deserialization/Filter.hpp b/include/lib/ArduinoJson/Deserialization/Filter.hpp index 7ea3078..7426d3b 100644 --- a/include/lib/ArduinoJson/Deserialization/Filter.hpp +++ b/include/lib/ArduinoJson/Deserialization/Filter.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/NestingLimit.hpp b/include/lib/ArduinoJson/Deserialization/NestingLimit.hpp index 06964b4..687b1ba 100644 --- a/include/lib/ArduinoJson/Deserialization/NestingLimit.hpp +++ b/include/lib/ArduinoJson/Deserialization/NestingLimit.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/Reader.hpp b/include/lib/ArduinoJson/Deserialization/Reader.hpp index e965c82..7b590ee 100644 --- a/include/lib/ArduinoJson/Deserialization/Reader.hpp +++ b/include/lib/ArduinoJson/Deserialization/Reader.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" #include // for size_t @@ -35,22 +35,22 @@ struct BoundedReader { }; } // namespace ARDUINOJSON_NAMESPACE -#include -#include -#include +#include "lib/ArduinoJson/Deserialization/Readers/IteratorReader.hpp" +#include "lib/ArduinoJson/Deserialization/Readers/RamReader.hpp" +#include "lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp" #if ARDUINOJSON_ENABLE_ARDUINO_STREAM -#include +#include "lib/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_STRING -#include +#include "lib/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp" #endif #if ARDUINOJSON_ENABLE_PROGMEM -#include +#include "lib/ArduinoJson/Deserialization/Readers/FlashReader.hpp" #endif #if ARDUINOJSON_ENABLE_STD_STREAM -#include +#include "lib/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp" #endif diff --git a/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp b/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp index 67cf682..7936049 100644 --- a/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp +++ b/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp b/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp index e56e262..76d21b5 100644 --- a/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp +++ b/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "lib/ArduinoJson/Object/MemberProxy.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/deserialize.hpp b/include/lib/ArduinoJson/Deserialization/deserialize.hpp index 2329542..af0f081 100644 --- a/include/lib/ArduinoJson/Deserialization/deserialize.hpp +++ b/include/lib/ArduinoJson/Deserialization/deserialize.hpp @@ -4,11 +4,11 @@ #pragma once -#include -#include -#include -#include -#include +#include "lib/ArduinoJson/Deserialization/DeserializationError.hpp" +#include "lib/ArduinoJson/Deserialization/Filter.hpp" +#include "lib/ArduinoJson/Deserialization/NestingLimit.hpp" +#include "lib/ArduinoJson/Deserialization/Reader.hpp" +#include "lib/ArduinoJson/StringStorage/StringStorage.hpp" namespace ARDUINOJSON_NAMESPACE { -- cgit v1.2.3