summaryrefslogtreecommitdiff
path: root/include/lib/ArduinoJson/Json
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2021-05-12 09:26:23 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2021-05-12 09:26:23 +0200
commit789986a05bd03935f1c344dc03ffaff36c8e7cdb (patch)
tree65b308c6705110aeb7853a10e44e0e6d7de6ed49 /include/lib/ArduinoJson/Json
parent39895a677e5d370824e702cfe90ebc67737b8482 (diff)
Make ArduinoJson work with MSP430 headers
Diffstat (limited to 'include/lib/ArduinoJson/Json')
-rw-r--r--include/lib/ArduinoJson/Json/EscapeSequence.hpp2
-rw-r--r--include/lib/ArduinoJson/Json/JsonDeserializer.hpp20
-rw-r--r--include/lib/ArduinoJson/Json/JsonSerializer.hpp8
-rw-r--r--include/lib/ArduinoJson/Json/Latch.hpp2
-rw-r--r--include/lib/ArduinoJson/Json/PrettyJsonSerializer.hpp8
-rw-r--r--include/lib/ArduinoJson/Json/TextFormatter.hpp20
-rw-r--r--include/lib/ArduinoJson/Json/Utf16.hpp2
-rw-r--r--include/lib/ArduinoJson/Json/Utf8.hpp2
8 files changed, 32 insertions, 32 deletions
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 <ArduinoJson/Namespace.hpp>
+#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 <ArduinoJson/Deserialization/deserialize.hpp>
-#include <ArduinoJson/Json/EscapeSequence.hpp>
-#include <ArduinoJson/Json/Latch.hpp>
-#include <ArduinoJson/Json/Utf16.hpp>
-#include <ArduinoJson/Json/Utf8.hpp>
-#include <ArduinoJson/Memory/MemoryPool.hpp>
-#include <ArduinoJson/Numbers/parseNumber.hpp>
-#include <ArduinoJson/Polyfills/assert.hpp>
-#include <ArduinoJson/Polyfills/type_traits.hpp>
-#include <ArduinoJson/Variant/VariantData.hpp>
+#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 <ArduinoJson/Json/TextFormatter.hpp>
-#include <ArduinoJson/Misc/Visitable.hpp>
-#include <ArduinoJson/Serialization/measure.hpp>
-#include <ArduinoJson/Serialization/serialize.hpp>
+#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 <ArduinoJson/Polyfills/assert.hpp>
+#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 <ArduinoJson/Configuration.hpp>
-#include <ArduinoJson/Json/JsonSerializer.hpp>
-#include <ArduinoJson/Serialization/measure.hpp>
-#include <ArduinoJson/Serialization/serialize.hpp>
+#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 <stdint.h>
#include <string.h> // for strlen
-#include <ArduinoJson/Json/EscapeSequence.hpp>
-#include <ArduinoJson/Numbers/FloatParts.hpp>
-#include <ArduinoJson/Numbers/Integer.hpp>
-#include <ArduinoJson/Polyfills/assert.hpp>
-#include <ArduinoJson/Polyfills/attributes.hpp>
-#include <ArduinoJson/Polyfills/type_traits.hpp>
-#include <ArduinoJson/Serialization/CountingDecorator.hpp>
+#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<size_t>(end - begin));
}
- template <size_t N>
- void writeRaw(const char (&s)[N]) {
- _writer.write(reinterpret_cast<const uint8_t *>(s), N - 1);
+ template <size_t TN>
+ void writeRaw(const char (&s)[TN]) {
+ _writer.write(reinterpret_cast<const uint8_t *>(s), TN - 1);
}
void writeRaw(char c) {
_writer.write(static_cast<uint8_t>(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 <ArduinoJson/Namespace.hpp>
+#include "lib/ArduinoJson/Namespace.hpp"
#include <stdint.h> // 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 <ArduinoJson/Namespace.hpp>
+#include "lib/ArduinoJson/Namespace.hpp"
namespace ARDUINOJSON_NAMESPACE {