summaryrefslogtreecommitdiff
path: root/include/lib/ArduinoJson/Array
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/Array
parent39895a677e5d370824e702cfe90ebc67737b8482 (diff)
Make ArduinoJson work with MSP430 headers
Diffstat (limited to 'include/lib/ArduinoJson/Array')
-rw-r--r--include/lib/ArduinoJson/Array/ArrayFunctions.hpp2
-rw-r--r--include/lib/ArduinoJson/Array/ArrayImpl.hpp4
-rw-r--r--include/lib/ArduinoJson/Array/ArrayIterator.hpp4
-rw-r--r--include/lib/ArduinoJson/Array/ArrayRef.hpp6
-rw-r--r--include/lib/ArduinoJson/Array/ArrayShortcuts.hpp4
-rw-r--r--include/lib/ArduinoJson/Array/ElementProxy.hpp8
-rw-r--r--include/lib/ArduinoJson/Array/Utilities.hpp22
7 files changed, 25 insertions, 25 deletions
diff --git a/include/lib/ArduinoJson/Array/ArrayFunctions.hpp b/include/lib/ArduinoJson/Array/ArrayFunctions.hpp
index e7cdc4c..8518268 100644
--- a/include/lib/ArduinoJson/Array/ArrayFunctions.hpp
+++ b/include/lib/ArduinoJson/Array/ArrayFunctions.hpp
@@ -4,7 +4,7 @@
#pragma once
-#include <ArduinoJson/Collection/CollectionData.hpp>
+#include "lib/ArduinoJson/Collection/CollectionData.hpp"
namespace ARDUINOJSON_NAMESPACE {
diff --git a/include/lib/ArduinoJson/Array/ArrayImpl.hpp b/include/lib/ArduinoJson/Array/ArrayImpl.hpp
index ae06b20..d8763b7 100644
--- a/include/lib/ArduinoJson/Array/ArrayImpl.hpp
+++ b/include/lib/ArduinoJson/Array/ArrayImpl.hpp
@@ -4,8 +4,8 @@
#pragma once
-#include <ArduinoJson/Array/ArrayRef.hpp>
-#include <ArduinoJson/Object/ObjectRef.hpp>
+#include "lib/ArduinoJson/Array/ArrayRef.hpp"
+#include "lib/ArduinoJson/Object/ObjectRef.hpp"
namespace ARDUINOJSON_NAMESPACE {
diff --git a/include/lib/ArduinoJson/Array/ArrayIterator.hpp b/include/lib/ArduinoJson/Array/ArrayIterator.hpp
index fcacc6b..29e92a5 100644
--- a/include/lib/ArduinoJson/Array/ArrayIterator.hpp
+++ b/include/lib/ArduinoJson/Array/ArrayIterator.hpp
@@ -4,8 +4,8 @@
#pragma once
-#include <ArduinoJson/Variant/SlotFunctions.hpp>
-#include <ArduinoJson/Variant/VariantRef.hpp>
+#include "lib/ArduinoJson/Variant/SlotFunctions.hpp"
+#include "lib/ArduinoJson/Variant/VariantRef.hpp"
namespace ARDUINOJSON_NAMESPACE {
diff --git a/include/lib/ArduinoJson/Array/ArrayRef.hpp b/include/lib/ArduinoJson/Array/ArrayRef.hpp
index a991db0..6e899d1 100644
--- a/include/lib/ArduinoJson/Array/ArrayRef.hpp
+++ b/include/lib/ArduinoJson/Array/ArrayRef.hpp
@@ -4,9 +4,9 @@
#pragma once
-#include <ArduinoJson/Array/ArrayFunctions.hpp>
-#include <ArduinoJson/Array/ArrayIterator.hpp>
-#include <ArduinoJson/Variant/VariantData.hpp>
+#include "lib/ArduinoJson/Array/ArrayFunctions.hpp"
+#include "lib/ArduinoJson/Array/ArrayIterator.hpp"
+#include "lib/ArduinoJson/Variant/VariantData.hpp"
// Returns the size (in bytes) of an array with n elements.
// Can be very handy to determine the size of a StaticMemoryPool.
diff --git a/include/lib/ArduinoJson/Array/ArrayShortcuts.hpp b/include/lib/ArduinoJson/Array/ArrayShortcuts.hpp
index fd26d04..8459322 100644
--- a/include/lib/ArduinoJson/Array/ArrayShortcuts.hpp
+++ b/include/lib/ArduinoJson/Array/ArrayShortcuts.hpp
@@ -4,8 +4,8 @@
#pragma once
-#include <ArduinoJson/Polyfills/attributes.hpp>
-#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include "lib/ArduinoJson/Polyfills/attributes.hpp"
+#include "lib/ArduinoJson/Polyfills/type_traits.hpp"
namespace ARDUINOJSON_NAMESPACE {
// Forward declarations.
diff --git a/include/lib/ArduinoJson/Array/ElementProxy.hpp b/include/lib/ArduinoJson/Array/ElementProxy.hpp
index c6062e4..f34395b 100644
--- a/include/lib/ArduinoJson/Array/ElementProxy.hpp
+++ b/include/lib/ArduinoJson/Array/ElementProxy.hpp
@@ -4,10 +4,10 @@
#pragma once
-#include <ArduinoJson/Configuration.hpp>
-#include <ArduinoJson/Variant/VariantOperators.hpp>
-#include <ArduinoJson/Variant/VariantShortcuts.hpp>
-#include <ArduinoJson/Variant/VariantTo.hpp>
+#include "lib/ArduinoJson/Configuration.hpp"
+#include "lib/ArduinoJson/Variant/VariantOperators.hpp"
+#include "lib/ArduinoJson/Variant/VariantShortcuts.hpp"
+#include "lib/ArduinoJson/Variant/VariantTo.hpp"
#ifdef _MSC_VER
#pragma warning(push)
diff --git a/include/lib/ArduinoJson/Array/Utilities.hpp b/include/lib/ArduinoJson/Array/Utilities.hpp
index 619b91d..d2cf4bf 100644
--- a/include/lib/ArduinoJson/Array/Utilities.hpp
+++ b/include/lib/ArduinoJson/Array/Utilities.hpp
@@ -4,24 +4,24 @@
#pragma once
-#include <ArduinoJson/Array/ArrayRef.hpp>
-#include <ArduinoJson/Document/JsonDocument.hpp>
-#include <ArduinoJson/Variant/Visitor.hpp>
+#include "lib/ArduinoJson/Array/ArrayRef.hpp"
+#include "lib/ArduinoJson/Document/JsonDocument.hpp"
+#include "lib/ArduinoJson/Variant/Visitor.hpp"
namespace ARDUINOJSON_NAMESPACE {
// Copy a 1D array to a JsonArray
-template <typename T, size_t N, typename TDestination>
+template <typename T, size_t TN, typename TDestination>
inline typename enable_if<!is_array<T>::value &&
!is_base_of<JsonDocument, TDestination>::value,
bool>::type
-copyArray(T (&src)[N], const TDestination& dst) {
- return copyArray(src, N, dst);
+copyArray(T (&src)[TN], const TDestination& dst) {
+ return copyArray(src, TN, dst);
}
// Copy a 1D array to a JsonDocument
-template <typename T, size_t N>
-inline bool copyArray(T (&src)[N], JsonDocument& dst) {
+template <typename T, size_t TN>
+inline bool copyArray(T (&src)[TN], JsonDocument& dst) {
return copyArray(src, dst.to<ArrayRef>());
}
@@ -109,10 +109,10 @@ class ArrayCopier2D : public Visitor<void> {
};
// Copy a JsonArray to a 1D array
-template <typename TSource, typename T, size_t N>
+template <typename TSource, typename T, size_t TN>
inline typename enable_if<!is_array<T>::value, size_t>::type copyArray(
- const TSource& src, T (&dst)[N]) {
- return copyArray(src, dst, N);
+ const TSource& src, T (&dst)[TN]) {
+ return copyArray(src, dst, TN);
}
// Copy a JsonArray to a 1D array