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 --- include/lib/ArduinoJson/Json/EscapeSequence.hpp | 2 +- include/lib/ArduinoJson/Json/JsonDeserializer.hpp | 20 ++++++++++---------- include/lib/ArduinoJson/Json/JsonSerializer.hpp | 8 ++++---- include/lib/ArduinoJson/Json/Latch.hpp | 2 +- .../lib/ArduinoJson/Json/PrettyJsonSerializer.hpp | 8 ++++---- include/lib/ArduinoJson/Json/TextFormatter.hpp | 20 ++++++++++---------- include/lib/ArduinoJson/Json/Utf16.hpp | 2 +- include/lib/ArduinoJson/Json/Utf8.hpp | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) (limited to 'include/lib/ArduinoJson/Json') diff --git a/include/lib/ArduinoJson/Json/EscapeSequence.hpp b/include/lib/ArduinoJson/Json/EscapeSequence.hpp index 811e825..39f1756 100644 --- a/include/lib/ArduinoJson/Json/EscapeSequence.hpp +++ b/include/lib/ArduinoJson/Json/EscapeSequence.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Json/JsonDeserializer.hpp b/include/lib/ArduinoJson/Json/JsonDeserializer.hpp index 1a07be8..6108d50 100644 --- a/include/lib/ArduinoJson/Json/JsonDeserializer.hpp +++ b/include/lib/ArduinoJson/Json/JsonDeserializer.hpp @@ -4,16 +4,16 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "lib/ArduinoJson/Deserialization/deserialize.hpp" +#include "lib/ArduinoJson/Json/EscapeSequence.hpp" +#include "lib/ArduinoJson/Json/Latch.hpp" +#include "lib/ArduinoJson/Json/Utf16.hpp" +#include "lib/ArduinoJson/Json/Utf8.hpp" +#include "lib/ArduinoJson/Memory/MemoryPool.hpp" +#include "lib/ArduinoJson/Numbers/parseNumber.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Variant/VariantData.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Json/JsonSerializer.hpp b/include/lib/ArduinoJson/Json/JsonSerializer.hpp index 5cb9aa2..f513bcb 100644 --- a/include/lib/ArduinoJson/Json/JsonSerializer.hpp +++ b/include/lib/ArduinoJson/Json/JsonSerializer.hpp @@ -4,10 +4,10 @@ #pragma once -#include -#include -#include -#include +#include "lib/ArduinoJson/Json/TextFormatter.hpp" +#include "lib/ArduinoJson/Misc/Visitable.hpp" +#include "lib/ArduinoJson/Serialization/measure.hpp" +#include "lib/ArduinoJson/Serialization/serialize.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Json/Latch.hpp b/include/lib/ArduinoJson/Json/Latch.hpp index aef1fe3..bb41419 100644 --- a/include/lib/ArduinoJson/Json/Latch.hpp +++ b/include/lib/ArduinoJson/Json/Latch.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Polyfills/assert.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Json/PrettyJsonSerializer.hpp b/include/lib/ArduinoJson/Json/PrettyJsonSerializer.hpp index dbb0c17..c33a659 100644 --- a/include/lib/ArduinoJson/Json/PrettyJsonSerializer.hpp +++ b/include/lib/ArduinoJson/Json/PrettyJsonSerializer.hpp @@ -4,10 +4,10 @@ #pragma once -#include -#include -#include -#include +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Json/JsonSerializer.hpp" +#include "lib/ArduinoJson/Serialization/measure.hpp" +#include "lib/ArduinoJson/Serialization/serialize.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Json/TextFormatter.hpp b/include/lib/ArduinoJson/Json/TextFormatter.hpp index 18694f1..1708bbd 100644 --- a/include/lib/ArduinoJson/Json/TextFormatter.hpp +++ b/include/lib/ArduinoJson/Json/TextFormatter.hpp @@ -7,13 +7,13 @@ #include #include // for strlen -#include -#include -#include -#include -#include -#include -#include +#include "lib/ArduinoJson/Json/EscapeSequence.hpp" +#include "lib/ArduinoJson/Numbers/FloatParts.hpp" +#include "lib/ArduinoJson/Numbers/Integer.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" +#include "lib/ArduinoJson/Polyfills/attributes.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Serialization/CountingDecorator.hpp" namespace ARDUINOJSON_NAMESPACE { @@ -145,9 +145,9 @@ class TextFormatter { static_cast(end - begin)); } - template - void writeRaw(const char (&s)[N]) { - _writer.write(reinterpret_cast(s), N - 1); + template + void writeRaw(const char (&s)[TN]) { + _writer.write(reinterpret_cast(s), TN - 1); } void writeRaw(char c) { _writer.write(static_cast(c)); diff --git a/include/lib/ArduinoJson/Json/Utf16.hpp b/include/lib/ArduinoJson/Json/Utf16.hpp index 4e2750f..83b3bc7 100644 --- a/include/lib/ArduinoJson/Json/Utf16.hpp +++ b/include/lib/ArduinoJson/Json/Utf16.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" #include // uint16_t, uint32_t diff --git a/include/lib/ArduinoJson/Json/Utf8.hpp b/include/lib/ArduinoJson/Json/Utf8.hpp index a30f77a..cc60f76 100644 --- a/include/lib/ArduinoJson/Json/Utf8.hpp +++ b/include/lib/ArduinoJson/Json/Utf8.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { -- cgit v1.2.3