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/Serialization/CountingDecorator.hpp | 2 +- include/lib/ArduinoJson/Serialization/Writer.hpp | 12 ++++++------ .../lib/ArduinoJson/Serialization/Writers/DummyWriter.hpp | 2 +- .../ArduinoJson/Serialization/Writers/StaticStringWriter.hpp | 2 +- .../ArduinoJson/Serialization/Writers/StdStringWriter.hpp | 4 ++-- include/lib/ArduinoJson/Serialization/measure.hpp | 2 +- include/lib/ArduinoJson/Serialization/serialize.hpp | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'include/lib/ArduinoJson/Serialization') diff --git a/include/lib/ArduinoJson/Serialization/CountingDecorator.hpp b/include/lib/ArduinoJson/Serialization/CountingDecorator.hpp index 3d89fb1..d251d56 100644 --- a/include/lib/ArduinoJson/Serialization/CountingDecorator.hpp +++ b/include/lib/ArduinoJson/Serialization/CountingDecorator.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Serialization/Writer.hpp b/include/lib/ArduinoJson/Serialization/Writer.hpp index 52bd117..8fed756 100644 --- a/include/lib/ArduinoJson/Serialization/Writer.hpp +++ b/include/lib/ArduinoJson/Serialization/Writer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { @@ -28,20 +28,20 @@ class Writer { } // namespace ARDUINOJSON_NAMESPACE -#include +#include "lib/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp" #if ARDUINOJSON_ENABLE_STD_STRING -#include +#include "lib/ArduinoJson/Serialization/Writers/StdStringWriter.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_STRING -#include +#include "lib/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp" #endif #if ARDUINOJSON_ENABLE_STD_STREAM -#include +#include "lib/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_PRINT -#include +#include "lib/ArduinoJson/Serialization/Writers/PrintWriter.hpp" #endif diff --git a/include/lib/ArduinoJson/Serialization/Writers/DummyWriter.hpp b/include/lib/ArduinoJson/Serialization/Writers/DummyWriter.hpp index a26a1f1..9105540 100644 --- a/include/lib/ArduinoJson/Serialization/Writers/DummyWriter.hpp +++ b/include/lib/ArduinoJson/Serialization/Writers/DummyWriter.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp b/include/lib/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp index 1a4213b..3132b35 100644 --- a/include/lib/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp +++ b/include/lib/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Serialization/Writers/StdStringWriter.hpp b/include/lib/ArduinoJson/Serialization/Writers/StdStringWriter.hpp index c1f7cc0..024a96f 100644 --- a/include/lib/ArduinoJson/Serialization/Writers/StdStringWriter.hpp +++ b/include/lib/ArduinoJson/Serialization/Writers/StdStringWriter.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" #include diff --git a/include/lib/ArduinoJson/Serialization/measure.hpp b/include/lib/ArduinoJson/Serialization/measure.hpp index 6d19994..e8b6065 100644 --- a/include/lib/ArduinoJson/Serialization/measure.hpp +++ b/include/lib/ArduinoJson/Serialization/measure.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Serialization/Writers/DummyWriter.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Serialization/serialize.hpp b/include/lib/ArduinoJson/Serialization/serialize.hpp index 16d2e4e..57081ce 100644 --- a/include/lib/ArduinoJson/Serialization/serialize.hpp +++ b/include/lib/ArduinoJson/Serialization/serialize.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "lib/ArduinoJson/Serialization/Writer.hpp" namespace ARDUINOJSON_NAMESPACE { @@ -41,14 +41,14 @@ serialize(const TSource &source, void *buffer, size_t bufferSize) { } template