From 789986a05bd03935f1c344dc03ffaff36c8e7cdb Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Wed, 12 May 2021 09:26:23 +0200
Subject: Make ArduinoJson work with MSP430 headers

---
 include/lib/ArduinoJson/Array/ArrayFunctions.hpp |  2 +-
 include/lib/ArduinoJson/Array/ArrayImpl.hpp      |  4 ++--
 include/lib/ArduinoJson/Array/ArrayIterator.hpp  |  4 ++--
 include/lib/ArduinoJson/Array/ArrayRef.hpp       |  6 +++---
 include/lib/ArduinoJson/Array/ArrayShortcuts.hpp |  4 ++--
 include/lib/ArduinoJson/Array/ElementProxy.hpp   |  8 ++++----
 include/lib/ArduinoJson/Array/Utilities.hpp      | 22 +++++++++++-----------
 7 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'include/lib/ArduinoJson/Array')

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
-- 
cgit v1.2.3