diff options
105 files changed, 299 insertions, 299 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 diff --git a/include/lib/ArduinoJson/Collection/CollectionData.hpp b/include/lib/ArduinoJson/Collection/CollectionData.hpp index d2bca45..2e9f82b 100644 --- a/include/lib/ArduinoJson/Collection/CollectionData.hpp +++ b/include/lib/ArduinoJson/Collection/CollectionData.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Polyfills/assert.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" #include <stddef.h> // size_t diff --git a/include/lib/ArduinoJson/Collection/CollectionImpl.hpp b/include/lib/ArduinoJson/Collection/CollectionImpl.hpp index 49a24be..8f96a78 100644 --- a/include/lib/ArduinoJson/Collection/CollectionImpl.hpp +++ b/include/lib/ArduinoJson/Collection/CollectionImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Collection/CollectionData.hpp> -#include <ArduinoJson/Variant/VariantData.hpp> +#include "lib/ArduinoJson/Collection/CollectionData.hpp" +#include "lib/ArduinoJson/Variant/VariantData.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp b/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp index 7b61711..15fafc1 100644 --- a/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp +++ b/include/lib/ArduinoJson/Deserialization/DeserializationError.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Polyfills/preprocessor.hpp> -#include <ArduinoJson/Polyfills/static_array.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/preprocessor.hpp" +#include "lib/ArduinoJson/Polyfills/static_array.hpp" #if ARDUINOJSON_ENABLE_STD_STREAM #include <ostream> diff --git a/include/lib/ArduinoJson/Deserialization/Filter.hpp b/include/lib/ArduinoJson/Deserialization/Filter.hpp index 7ea3078..7426d3b 100644 --- a/include/lib/ArduinoJson/Deserialization/Filter.hpp +++ b/include/lib/ArduinoJson/Deserialization/Filter.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/Deserialization/NestingLimit.hpp b/include/lib/ArduinoJson/Deserialization/NestingLimit.hpp index 06964b4..687b1ba 100644 --- a/include/lib/ArduinoJson/Deserialization/NestingLimit.hpp +++ b/include/lib/ArduinoJson/Deserialization/NestingLimit.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Polyfills/assert.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/Reader.hpp b/include/lib/ArduinoJson/Deserialization/Reader.hpp index e965c82..7b590ee 100644 --- a/include/lib/ArduinoJson/Deserialization/Reader.hpp +++ b/include/lib/ArduinoJson/Deserialization/Reader.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" #include <stdlib.h> // for size_t @@ -35,22 +35,22 @@ struct BoundedReader { }; } // namespace ARDUINOJSON_NAMESPACE -#include <ArduinoJson/Deserialization/Readers/IteratorReader.hpp> -#include <ArduinoJson/Deserialization/Readers/RamReader.hpp> -#include <ArduinoJson/Deserialization/Readers/VariantReader.hpp> +#include "lib/ArduinoJson/Deserialization/Readers/IteratorReader.hpp" +#include "lib/ArduinoJson/Deserialization/Readers/RamReader.hpp" +#include "lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp" #if ARDUINOJSON_ENABLE_ARDUINO_STREAM -#include <ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp> +#include "lib/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_STRING -#include <ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp> +#include "lib/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp" #endif #if ARDUINOJSON_ENABLE_PROGMEM -#include <ArduinoJson/Deserialization/Readers/FlashReader.hpp> +#include "lib/ArduinoJson/Deserialization/Readers/FlashReader.hpp" #endif #if ARDUINOJSON_ENABLE_STD_STREAM -#include <ArduinoJson/Deserialization/Readers/StdStreamReader.hpp> +#include "lib/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp" #endif diff --git a/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp b/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp index 67cf682..7936049 100644 --- a/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp +++ b/include/lib/ArduinoJson/Deserialization/Readers/RamReader.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp b/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp index e56e262..76d21b5 100644 --- a/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp +++ b/include/lib/ArduinoJson/Deserialization/Readers/VariantReader.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Object/MemberProxy.hpp> -#include <ArduinoJson/Variant/VariantRef.hpp> +#include "lib/ArduinoJson/Object/MemberProxy.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Deserialization/deserialize.hpp b/include/lib/ArduinoJson/Deserialization/deserialize.hpp index 2329542..af0f081 100644 --- a/include/lib/ArduinoJson/Deserialization/deserialize.hpp +++ b/include/lib/ArduinoJson/Deserialization/deserialize.hpp @@ -4,11 +4,11 @@ #pragma once -#include <ArduinoJson/Deserialization/DeserializationError.hpp> -#include <ArduinoJson/Deserialization/Filter.hpp> -#include <ArduinoJson/Deserialization/NestingLimit.hpp> -#include <ArduinoJson/Deserialization/Reader.hpp> -#include <ArduinoJson/StringStorage/StringStorage.hpp> +#include "lib/ArduinoJson/Deserialization/DeserializationError.hpp" +#include "lib/ArduinoJson/Deserialization/Filter.hpp" +#include "lib/ArduinoJson/Deserialization/NestingLimit.hpp" +#include "lib/ArduinoJson/Deserialization/Reader.hpp" +#include "lib/ArduinoJson/StringStorage/StringStorage.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Document/BasicJsonDocument.hpp b/include/lib/ArduinoJson/Document/BasicJsonDocument.hpp index 5c85d8a..3818d67 100644 --- a/include/lib/ArduinoJson/Document/BasicJsonDocument.hpp +++ b/include/lib/ArduinoJson/Document/BasicJsonDocument.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Document/JsonDocument.hpp> +#include "lib/ArduinoJson/Document/JsonDocument.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Document/DynamicJsonDocument.hpp b/include/lib/ArduinoJson/Document/DynamicJsonDocument.hpp index de6f411..912cf1d 100644 --- a/include/lib/ArduinoJson/Document/DynamicJsonDocument.hpp +++ b/include/lib/ArduinoJson/Document/DynamicJsonDocument.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Document/BasicJsonDocument.hpp> +#include "lib/ArduinoJson/Document/BasicJsonDocument.hpp" #include <stdlib.h> // malloc, free diff --git a/include/lib/ArduinoJson/Document/JsonDocument.hpp b/include/lib/ArduinoJson/Document/JsonDocument.hpp index d67d934..721cc1c 100644 --- a/include/lib/ArduinoJson/Document/JsonDocument.hpp +++ b/include/lib/ArduinoJson/Document/JsonDocument.hpp @@ -4,12 +4,12 @@ #pragma once -#include <ArduinoJson/Array/ElementProxy.hpp> -#include <ArduinoJson/Memory/MemoryPool.hpp> -#include <ArduinoJson/Object/MemberProxy.hpp> -#include <ArduinoJson/Object/ObjectRef.hpp> -#include <ArduinoJson/Variant/VariantRef.hpp> -#include <ArduinoJson/Variant/VariantTo.hpp> +#include "lib/ArduinoJson/Array/ElementProxy.hpp" +#include "lib/ArduinoJson/Memory/MemoryPool.hpp" +#include "lib/ArduinoJson/Object/MemberProxy.hpp" +#include "lib/ArduinoJson/Object/ObjectRef.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.hpp" +#include "lib/ArduinoJson/Variant/VariantTo.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Document/StaticJsonDocument.hpp b/include/lib/ArduinoJson/Document/StaticJsonDocument.hpp index fbbadd4..db12bcb 100644 --- a/include/lib/ArduinoJson/Document/StaticJsonDocument.hpp +++ b/include/lib/ArduinoJson/Document/StaticJsonDocument.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Document/JsonDocument.hpp> +#include "lib/ArduinoJson/Document/JsonDocument.hpp" namespace ARDUINOJSON_NAMESPACE { 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 { diff --git a/include/lib/ArduinoJson/Memory/Alignment.hpp b/include/lib/ArduinoJson/Memory/Alignment.hpp index bf16798..e1fe4c2 100644 --- a/include/lib/ArduinoJson/Memory/Alignment.hpp +++ b/include/lib/ArduinoJson/Memory/Alignment.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" #include <stddef.h> // size_t diff --git a/include/lib/ArduinoJson/Memory/MemoryPool.hpp b/include/lib/ArduinoJson/Memory/MemoryPool.hpp index 49debf8..d2c8926 100644 --- a/include/lib/ArduinoJson/Memory/MemoryPool.hpp +++ b/include/lib/ArduinoJson/Memory/MemoryPool.hpp @@ -4,10 +4,10 @@ #pragma once -#include <ArduinoJson/Memory/Alignment.hpp> -#include <ArduinoJson/Polyfills/assert.hpp> -#include <ArduinoJson/Polyfills/mpl/max.hpp> -#include <ArduinoJson/Variant/VariantSlot.hpp> +#include "lib/ArduinoJson/Memory/Alignment.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" +#include "lib/ArduinoJson/Polyfills/mpl/max.hpp" +#include "lib/ArduinoJson/Variant/VariantSlot.hpp" #include <string.h> // memmove diff --git a/include/lib/ArduinoJson/Misc/SerializedValue.hpp b/include/lib/ArduinoJson/Misc/SerializedValue.hpp index 30173bf..b285e0a 100644 --- a/include/lib/ArduinoJson/Misc/SerializedValue.hpp +++ b/include/lib/ArduinoJson/Misc/SerializedValue.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Strings/StringAdapters.hpp> +#include "lib/ArduinoJson/Strings/StringAdapters.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Misc/Visitable.hpp b/include/lib/ArduinoJson/Misc/Visitable.hpp index f25d12f..f2eb892 100644 --- a/include/lib/ArduinoJson/Misc/Visitable.hpp +++ b/include/lib/ArduinoJson/Misc/Visitable.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/include/lib/ArduinoJson/MsgPack/MsgPackDeserializer.hpp index 49c6fd4..c17be2d 100644 --- a/include/lib/ArduinoJson/MsgPack/MsgPackDeserializer.hpp +++ b/include/lib/ArduinoJson/MsgPack/MsgPackDeserializer.hpp @@ -4,12 +4,12 @@ #pragma once -#include <ArduinoJson/Deserialization/deserialize.hpp> -#include <ArduinoJson/Memory/MemoryPool.hpp> -#include <ArduinoJson/MsgPack/endianess.hpp> -#include <ArduinoJson/MsgPack/ieee754.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Variant/VariantData.hpp> +#include "lib/ArduinoJson/Deserialization/deserialize.hpp" +#include "lib/ArduinoJson/Memory/MemoryPool.hpp" +#include "lib/ArduinoJson/MsgPack/endianess.hpp" +#include "lib/ArduinoJson/MsgPack/ieee754.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Variant/VariantData.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/MsgPack/MsgPackSerializer.hpp b/include/lib/ArduinoJson/MsgPack/MsgPackSerializer.hpp index b1cd872..2a880b7 100644 --- a/include/lib/ArduinoJson/MsgPack/MsgPackSerializer.hpp +++ b/include/lib/ArduinoJson/MsgPack/MsgPackSerializer.hpp @@ -4,13 +4,13 @@ #pragma once -#include <ArduinoJson/MsgPack/endianess.hpp> -#include <ArduinoJson/Polyfills/assert.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Serialization/CountingDecorator.hpp> -#include <ArduinoJson/Serialization/measure.hpp> -#include <ArduinoJson/Serialization/serialize.hpp> -#include <ArduinoJson/Variant/VariantData.hpp> +#include "lib/ArduinoJson/MsgPack/endianess.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Serialization/CountingDecorator.hpp" +#include "lib/ArduinoJson/Serialization/measure.hpp" +#include "lib/ArduinoJson/Serialization/serialize.hpp" +#include "lib/ArduinoJson/Variant/VariantData.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/MsgPack/endianess.hpp b/include/lib/ArduinoJson/MsgPack/endianess.hpp index 74f7e9d..bd42a45 100644 --- a/include/lib/ArduinoJson/MsgPack/endianess.hpp +++ b/include/lib/ArduinoJson/MsgPack/endianess.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Polyfills/utility.hpp> +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Polyfills/utility.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/MsgPack/ieee754.hpp b/include/lib/ArduinoJson/MsgPack/ieee754.hpp index 016d533..168c824 100644 --- a/include/lib/ArduinoJson/MsgPack/ieee754.hpp +++ b/include/lib/ArduinoJson/MsgPack/ieee754.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/Namespace.hpp b/include/lib/ArduinoJson/Namespace.hpp index 2d85440..9b18c65 100644 --- a/include/lib/ArduinoJson/Namespace.hpp +++ b/include/lib/ArduinoJson/Namespace.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Polyfills/preprocessor.hpp> -#include <ArduinoJson/version.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Polyfills/preprocessor.hpp" +#include "lib/ArduinoJson/version.hpp" #ifndef ARDUINOJSON_NAMESPACE diff --git a/include/lib/ArduinoJson/Numbers/Float.hpp b/include/lib/ArduinoJson/Numbers/Float.hpp index bbaca04..4ac9229 100644 --- a/include/lib/ArduinoJson/Numbers/Float.hpp +++ b/include/lib/ArduinoJson/Numbers/Float.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Numbers/FloatParts.hpp b/include/lib/ArduinoJson/Numbers/FloatParts.hpp index 4e53add..62b40ed 100644 --- a/include/lib/ArduinoJson/Numbers/FloatParts.hpp +++ b/include/lib/ArduinoJson/Numbers/FloatParts.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Numbers/FloatTraits.hpp> -#include <ArduinoJson/Polyfills/math.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Numbers/FloatTraits.hpp" +#include "lib/ArduinoJson/Polyfills/math.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Numbers/FloatTraits.hpp b/include/lib/ArduinoJson/Numbers/FloatTraits.hpp index 60b1dfd..d185ff4 100644 --- a/include/lib/ArduinoJson/Numbers/FloatTraits.hpp +++ b/include/lib/ArduinoJson/Numbers/FloatTraits.hpp @@ -7,11 +7,11 @@ #include <stddef.h> // for size_t #include <stdint.h> -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Polyfills/alias_cast.hpp> -#include <ArduinoJson/Polyfills/math.hpp> -#include <ArduinoJson/Polyfills/preprocessor.hpp> -#include <ArduinoJson/Polyfills/static_array.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Polyfills/alias_cast.hpp" +#include "lib/ArduinoJson/Polyfills/math.hpp" +#include "lib/ArduinoJson/Polyfills/preprocessor.hpp" +#include "lib/ArduinoJson/Polyfills/static_array.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Numbers/Integer.hpp b/include/lib/ArduinoJson/Numbers/Integer.hpp index fb656a7..3dd113b 100644 --- a/include/lib/ArduinoJson/Numbers/Integer.hpp +++ b/include/lib/ArduinoJson/Numbers/Integer.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Namespace.hpp" #include <stdint.h> // int64_t diff --git a/include/lib/ArduinoJson/Numbers/arithmeticCompare.hpp b/include/lib/ArduinoJson/Numbers/arithmeticCompare.hpp index bfd41d5..339df0c 100644 --- a/include/lib/ArduinoJson/Numbers/arithmeticCompare.hpp +++ b/include/lib/ArduinoJson/Numbers/arithmeticCompare.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Numbers/Integer.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Numbers/Integer.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Numbers/convertNumber.hpp b/include/lib/ArduinoJson/Numbers/convertNumber.hpp index 02bbefa..0444b30 100644 --- a/include/lib/ArduinoJson/Numbers/convertNumber.hpp +++ b/include/lib/ArduinoJson/Numbers/convertNumber.hpp @@ -14,9 +14,9 @@ #pragma GCC diagnostic ignored "-Wconversion" #endif -#include <ArduinoJson/Numbers/Float.hpp> -#include <ArduinoJson/Polyfills/limits.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Numbers/Float.hpp" +#include "lib/ArduinoJson/Polyfills/limits.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Numbers/parseNumber.hpp b/include/lib/ArduinoJson/Numbers/parseNumber.hpp index cf050c7..54395ea 100644 --- a/include/lib/ArduinoJson/Numbers/parseNumber.hpp +++ b/include/lib/ArduinoJson/Numbers/parseNumber.hpp @@ -4,14 +4,14 @@ #pragma once -#include <ArduinoJson/Numbers/FloatTraits.hpp> -#include <ArduinoJson/Numbers/convertNumber.hpp> -#include <ArduinoJson/Polyfills/assert.hpp> -#include <ArduinoJson/Polyfills/ctype.hpp> -#include <ArduinoJson/Polyfills/math.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Variant/Converter.hpp> -#include <ArduinoJson/Variant/VariantData.hpp> +#include "lib/ArduinoJson/Numbers/FloatTraits.hpp" +#include "lib/ArduinoJson/Numbers/convertNumber.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" +#include "lib/ArduinoJson/Polyfills/ctype.hpp" +#include "lib/ArduinoJson/Polyfills/math.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Variant/Converter.hpp" +#include "lib/ArduinoJson/Variant/VariantData.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Object/MemberProxy.hpp b/include/lib/ArduinoJson/Object/MemberProxy.hpp index 0bee84b..369616c 100644 --- a/include/lib/ArduinoJson/Object/MemberProxy.hpp +++ b/include/lib/ArduinoJson/Object/MemberProxy.hpp @@ -4,12 +4,12 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Variant/VariantOperators.hpp> -#include <ArduinoJson/Variant/VariantRef.hpp> -#include <ArduinoJson/Variant/VariantShortcuts.hpp> -#include <ArduinoJson/Variant/VariantTo.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Variant/VariantOperators.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.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/Object/ObjectFunctions.hpp b/include/lib/ArduinoJson/Object/ObjectFunctions.hpp index 1b46e84..d2b7ddc 100644 --- a/include/lib/ArduinoJson/Object/ObjectFunctions.hpp +++ b/include/lib/ArduinoJson/Object/ObjectFunctions.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/Object/ObjectImpl.hpp b/include/lib/ArduinoJson/Object/ObjectImpl.hpp index d66b61c..205749c 100644 --- a/include/lib/ArduinoJson/Object/ObjectImpl.hpp +++ b/include/lib/ArduinoJson/Object/ObjectImpl.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/Object/ObjectIterator.hpp b/include/lib/ArduinoJson/Object/ObjectIterator.hpp index d729459..7b03ffe 100644 --- a/include/lib/ArduinoJson/Object/ObjectIterator.hpp +++ b/include/lib/ArduinoJson/Object/ObjectIterator.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Object/Pair.hpp> -#include <ArduinoJson/Variant/SlotFunctions.hpp> +#include "lib/ArduinoJson/Object/Pair.hpp" +#include "lib/ArduinoJson/Variant/SlotFunctions.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Object/ObjectRef.hpp b/include/lib/ArduinoJson/Object/ObjectRef.hpp index c945fb6..02df3d6 100644 --- a/include/lib/ArduinoJson/Object/ObjectRef.hpp +++ b/include/lib/ArduinoJson/Object/ObjectRef.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Object/ObjectFunctions.hpp> -#include <ArduinoJson/Object/ObjectIterator.hpp> +#include "lib/ArduinoJson/Object/ObjectFunctions.hpp" +#include "lib/ArduinoJson/Object/ObjectIterator.hpp" // Returns the size (in bytes) of an object with n elements. // Can be very handy to determine the size of a StaticMemoryPool. diff --git a/include/lib/ArduinoJson/Object/ObjectShortcuts.hpp b/include/lib/ArduinoJson/Object/ObjectShortcuts.hpp index 0f3409f..8861787 100644 --- a/include/lib/ArduinoJson/Object/ObjectShortcuts.hpp +++ b/include/lib/ArduinoJson/Object/ObjectShortcuts.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Polyfills/attributes.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Strings/StringAdapters.hpp> +#include "lib/ArduinoJson/Polyfills/attributes.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Strings/StringAdapters.hpp" namespace ARDUINOJSON_NAMESPACE { template <typename TParent, typename TStringRef> diff --git a/include/lib/ArduinoJson/Object/Pair.hpp b/include/lib/ArduinoJson/Object/Pair.hpp index 44fce75..8a2d6b6 100644 --- a/include/lib/ArduinoJson/Object/Pair.hpp +++ b/include/lib/ArduinoJson/Object/Pair.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Strings/String.hpp> -#include <ArduinoJson/Variant/VariantRef.hpp> +#include "lib/ArduinoJson/Strings/String.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.hpp" namespace ARDUINOJSON_NAMESPACE { // A key value pair for CollectionData. diff --git a/include/lib/ArduinoJson/Polyfills/alias_cast.hpp b/include/lib/ArduinoJson/Polyfills/alias_cast.hpp index 8f8e277..96fa4a1 100644 --- a/include/lib/ArduinoJson/Polyfills/alias_cast.hpp +++ b/include/lib/ArduinoJson/Polyfills/alias_cast.hpp @@ -7,7 +7,7 @@ #include <stdint.h> #include <stdlib.h> // for size_t -#include <ArduinoJson/Configuration.hpp> +#include "lib/ArduinoJson/Configuration.hpp" #include "math.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Polyfills/assert.hpp b/include/lib/ArduinoJson/Polyfills/assert.hpp index 1030ec6..21fe3c5 100644 --- a/include/lib/ArduinoJson/Polyfills/assert.hpp +++ b/include/lib/ArduinoJson/Polyfills/assert.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> +#include "lib/ArduinoJson/Configuration.hpp" #if ARDUINOJSON_DEBUG #include <assert.h> diff --git a/include/lib/ArduinoJson/Polyfills/ctype.hpp b/include/lib/ArduinoJson/Polyfills/ctype.hpp index bd7a8cc..c6e9f7b 100644 --- a/include/lib/ArduinoJson/Polyfills/ctype.hpp +++ b/include/lib/ArduinoJson/Polyfills/ctype.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/Polyfills/integer.hpp b/include/lib/ArduinoJson/Polyfills/integer.hpp index 066c7b8..ea56789 100644 --- a/include/lib/ArduinoJson/Polyfills/integer.hpp +++ b/include/lib/ArduinoJson/Polyfills/integer.hpp @@ -6,7 +6,7 @@ #include <stdint.h> // int8_t, int16_t -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Polyfills/math.hpp b/include/lib/ArduinoJson/Polyfills/math.hpp index eff272a..b8c37c8 100644 --- a/include/lib/ArduinoJson/Polyfills/math.hpp +++ b/include/lib/ArduinoJson/Polyfills/math.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/Polyfills/mpl/max.hpp b/include/lib/ArduinoJson/Polyfills/mpl/max.hpp index 9ac47a5..a7e827a 100644 --- a/include/lib/ArduinoJson/Polyfills/mpl/max.hpp +++ b/include/lib/ArduinoJson/Polyfills/mpl/max.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" #include <stddef.h> // for size_t diff --git a/include/lib/ArduinoJson/Polyfills/pgmspace.hpp b/include/lib/ArduinoJson/Polyfills/pgmspace.hpp index f253818..31c0ecc 100644 --- a/include/lib/ArduinoJson/Polyfills/pgmspace.hpp +++ b/include/lib/ArduinoJson/Polyfills/pgmspace.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Polyfills/assert.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/assert.hpp" namespace ARDUINOJSON_NAMESPACE { // Wraps a const char* so that the our functions are picked only if the diff --git a/include/lib/ArduinoJson/Polyfills/pgmspace_generic.hpp b/include/lib/ArduinoJson/Polyfills/pgmspace_generic.hpp index f5bbd85..772e431 100644 --- a/include/lib/ArduinoJson/Polyfills/pgmspace_generic.hpp +++ b/include/lib/ArduinoJson/Polyfills/pgmspace_generic.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Polyfills/safe_strcmp.hpp b/include/lib/ArduinoJson/Polyfills/safe_strcmp.hpp index e017b5d..9baee5a 100644 --- a/include/lib/ArduinoJson/Polyfills/safe_strcmp.hpp +++ b/include/lib/ArduinoJson/Polyfills/safe_strcmp.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" #include <stdint.h> // int8_t diff --git a/include/lib/ArduinoJson/Polyfills/static_array.hpp b/include/lib/ArduinoJson/Polyfills/static_array.hpp index a877b4c..c9a53ec 100644 --- a/include/lib/ArduinoJson/Polyfills/static_array.hpp +++ b/include/lib/ArduinoJson/Polyfills/static_array.hpp @@ -4,11 +4,11 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> +#include "lib/ArduinoJson/Configuration.hpp" #if ARDUINOJSON_ENABLE_PROGMEM -#include <ArduinoJson/Polyfills/pgmspace_generic.hpp> +#include "lib/ArduinoJson/Polyfills/pgmspace_generic.hpp" #ifndef ARDUINOJSON_DEFINE_STATIC_ARRAY #define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \ diff --git a/include/lib/ArduinoJson/Polyfills/type_traits/conditional.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/conditional.hpp index e42d1bb..226c2ef 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/conditional.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/conditional.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/Polyfills/type_traits/declval.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/declval.hpp index 8708112..6c24bf3 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/declval.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/declval.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/Polyfills/type_traits/enable_if.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/enable_if.hpp index cc29b33..cfa0919 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/enable_if.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/enable_if.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/Polyfills/type_traits/integral_constant.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/integral_constant.hpp index b53d711..4e4414f 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/integral_constant.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/integral_constant.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/Polyfills/type_traits/is_array.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/is_array.hpp index ee739a7..8272cb1 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/is_array.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/is_array.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" #include <stddef.h> // size_t @@ -16,6 +16,6 @@ struct is_array : false_type {}; template <typename T> struct is_array<T[]> : true_type {}; -template <typename T, size_t N> -struct is_array<T[N]> : true_type {}; +template <typename T, size_t TN> +struct is_array<T[TN]> : true_type {}; } // namespace ARDUINOJSON_NAMESPACE diff --git a/include/lib/ArduinoJson/Polyfills/type_traits/is_base_of.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/is_base_of.hpp index 32b41cd..7c69eff 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/is_base_of.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/is_base_of.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/Polyfills/type_traits/is_integral.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/is_integral.hpp index 26e895c..1961880 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/is_integral.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/is_integral.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> +#include "lib/ArduinoJson/Configuration.hpp" #include "is_same.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Polyfills/type_traits/remove_const.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/remove_const.hpp index 5a19eb1..074cbe2 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/remove_const.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/remove_const.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/Polyfills/type_traits/remove_reference.hpp b/include/lib/ArduinoJson/Polyfills/type_traits/remove_reference.hpp index 1812850..23dc7b3 100644 --- a/include/lib/ArduinoJson/Polyfills/type_traits/remove_reference.hpp +++ b/include/lib/ArduinoJson/Polyfills/type_traits/remove_reference.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/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 <ArduinoJson/Namespace.hpp> +#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 <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { @@ -28,20 +28,20 @@ class Writer { } // namespace ARDUINOJSON_NAMESPACE -#include <ArduinoJson/Serialization/Writers/StaticStringWriter.hpp> +#include "lib/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp" #if ARDUINOJSON_ENABLE_STD_STRING -#include <ArduinoJson/Serialization/Writers/StdStringWriter.hpp> +#include "lib/ArduinoJson/Serialization/Writers/StdStringWriter.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_STRING -#include <ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp> +#include "lib/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp" #endif #if ARDUINOJSON_ENABLE_STD_STREAM -#include <ArduinoJson/Serialization/Writers/StdStreamWriter.hpp> +#include "lib/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_PRINT -#include <ArduinoJson/Serialization/Writers/PrintWriter.hpp> +#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 <ArduinoJson/Namespace.hpp> +#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 <ArduinoJson/Namespace.hpp> +#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 <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" #include <string> 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 <ArduinoJson/Serialization/Writers/DummyWriter.hpp> +#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 <ArduinoJson/Serialization/Writer.hpp> +#include "lib/ArduinoJson/Serialization/Writer.hpp" namespace ARDUINOJSON_NAMESPACE { @@ -41,14 +41,14 @@ serialize(const TSource &source, void *buffer, size_t bufferSize) { } template <template <typename> class TSerializer, typename TSource, - typename TChar, size_t N> + typename TChar, size_t TN> #if defined _MSC_VER && _MSC_VER < 1900 typename enable_if<sizeof(remove_reference<TChar>::type) == 1, size_t>::type #else typename enable_if<sizeof(TChar) == 1, size_t>::type #endif -serialize(const TSource &source, TChar (&buffer)[N]) { - return serialize<TSerializer>(source, buffer, N); +serialize(const TSource &source, TChar (&buffer)[TN]) { + return serialize<TSerializer>(source, buffer, TN); } } // namespace ARDUINOJSON_NAMESPACE diff --git a/include/lib/ArduinoJson/StringStorage/StringCopier.hpp b/include/lib/ArduinoJson/StringStorage/StringCopier.hpp index 8b1104b..33210a9 100644 --- a/include/lib/ArduinoJson/StringStorage/StringCopier.hpp +++ b/include/lib/ArduinoJson/StringStorage/StringCopier.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Memory/MemoryPool.hpp> +#include "lib/ArduinoJson/Memory/MemoryPool.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/StringStorage/StringMover.hpp b/include/lib/ArduinoJson/StringStorage/StringMover.hpp index f727a7d..2f6f441 100644 --- a/include/lib/ArduinoJson/StringStorage/StringMover.hpp +++ b/include/lib/ArduinoJson/StringStorage/StringMover.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/StringStorage/StringStorage.hpp b/include/lib/ArduinoJson/StringStorage/StringStorage.hpp index 36e6326..509c855 100644 --- a/include/lib/ArduinoJson/StringStorage/StringStorage.hpp +++ b/include/lib/ArduinoJson/StringStorage/StringStorage.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/StringStorage/StringCopier.hpp> -#include <ArduinoJson/StringStorage/StringMover.hpp> +#include "lib/ArduinoJson/StringStorage/StringCopier.hpp" +#include "lib/ArduinoJson/StringStorage/StringMover.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Strings/ArduinoStringAdapter.hpp b/include/lib/ArduinoJson/Strings/ArduinoStringAdapter.hpp index 24646cc..8255645 100644 --- a/include/lib/ArduinoJson/Strings/ArduinoStringAdapter.hpp +++ b/include/lib/ArduinoJson/Strings/ArduinoStringAdapter.hpp @@ -6,9 +6,9 @@ #include <Arduino.h> -#include <ArduinoJson/Polyfills/safe_strcmp.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Polyfills/safe_strcmp.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp b/include/lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp index ec7d53a..a76f07f 100644 --- a/include/lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp +++ b/include/lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp @@ -7,9 +7,9 @@ #include <stddef.h> // size_t #include <string.h> // strcmp -#include <ArduinoJson/Polyfills/safe_strcmp.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Polyfills/safe_strcmp.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" namespace ARDUINOJSON_NAMESPACE { @@ -52,8 +52,8 @@ class ConstRamStringAdapter { template <> struct IsString<const char*> : true_type {}; -template <int N> -struct IsString<const char[N]> : true_type {}; +template <int TN> +struct IsString<const char[TN]> : true_type {}; inline ConstRamStringAdapter adaptString(const char* str) { return ConstRamStringAdapter(str); diff --git a/include/lib/ArduinoJson/Strings/FlashStringAdapter.hpp b/include/lib/ArduinoJson/Strings/FlashStringAdapter.hpp index 292e348..3a7f1ad 100644 --- a/include/lib/ArduinoJson/Strings/FlashStringAdapter.hpp +++ b/include/lib/ArduinoJson/Strings/FlashStringAdapter.hpp @@ -4,10 +4,10 @@ #pragma once -#include <ArduinoJson/Polyfills/pgmspace.hpp> -#include <ArduinoJson/Strings/FlashStringIterator.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Polyfills/pgmspace.hpp" +#include "lib/ArduinoJson/Strings/FlashStringIterator.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Strings/IsString.hpp b/include/lib/ArduinoJson/Strings/IsString.hpp index af5a91a..c35074e 100644 --- a/include/lib/ArduinoJson/Strings/IsString.hpp +++ b/include/lib/ArduinoJson/Strings/IsString.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { template <typename> diff --git a/include/lib/ArduinoJson/Strings/IsWriteableString.hpp b/include/lib/ArduinoJson/Strings/IsWriteableString.hpp index 32039e3..4d239c8 100644 --- a/include/lib/ArduinoJson/Strings/IsWriteableString.hpp +++ b/include/lib/ArduinoJson/Strings/IsWriteableString.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" #if ARDUINOJSON_ENABLE_ARDUINO_STRING #include <Arduino.h> diff --git a/include/lib/ArduinoJson/Strings/RamStringAdapter.hpp b/include/lib/ArduinoJson/Strings/RamStringAdapter.hpp index eded6c9..3aa4af1 100644 --- a/include/lib/ArduinoJson/Strings/RamStringAdapter.hpp +++ b/include/lib/ArduinoJson/Strings/RamStringAdapter.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Strings/SizedFlashStringAdapter.hpp b/include/lib/ArduinoJson/Strings/SizedFlashStringAdapter.hpp index b9cc0bf..0c4e8ae 100644 --- a/include/lib/ArduinoJson/Strings/SizedFlashStringAdapter.hpp +++ b/include/lib/ArduinoJson/Strings/SizedFlashStringAdapter.hpp @@ -4,10 +4,10 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Strings/FlashStringIterator.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Strings/FlashStringIterator.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Strings/SizedRamStringAdapter.hpp b/include/lib/ArduinoJson/Strings/SizedRamStringAdapter.hpp index fe23408..8c83950 100644 --- a/include/lib/ArduinoJson/Strings/SizedRamStringAdapter.hpp +++ b/include/lib/ArduinoJson/Strings/SizedRamStringAdapter.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" #include <string.h> // strcmp diff --git a/include/lib/ArduinoJson/Strings/StdStringAdapter.hpp b/include/lib/ArduinoJson/Strings/StdStringAdapter.hpp index ebf4c39..32d417b 100644 --- a/include/lib/ArduinoJson/Strings/StdStringAdapter.hpp +++ b/include/lib/ArduinoJson/Strings/StdStringAdapter.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" #include <string> diff --git a/include/lib/ArduinoJson/Strings/String.hpp b/include/lib/ArduinoJson/Strings/String.hpp index 4f2abde..ba4c094 100644 --- a/include/lib/ArduinoJson/Strings/String.hpp +++ b/include/lib/ArduinoJson/Strings/String.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> +#include "lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Strings/StringAdapters.hpp b/include/lib/ArduinoJson/Strings/StringAdapters.hpp index 3d294d2..0cf8acc 100644 --- a/include/lib/ArduinoJson/Strings/StringAdapters.hpp +++ b/include/lib/ArduinoJson/Strings/StringAdapters.hpp @@ -4,19 +4,19 @@ #pragma once -#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp> -#include <ArduinoJson/Strings/RamStringAdapter.hpp> -#include <ArduinoJson/Strings/SizedRamStringAdapter.hpp> +#include "lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/RamStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/SizedRamStringAdapter.hpp" #if ARDUINOJSON_ENABLE_STD_STRING -#include <ArduinoJson/Strings/StdStringAdapter.hpp> +#include "lib/ArduinoJson/Strings/StdStringAdapter.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_STRING -#include <ArduinoJson/Strings/ArduinoStringAdapter.hpp> +#include "lib/ArduinoJson/Strings/ArduinoStringAdapter.hpp" #endif #if ARDUINOJSON_ENABLE_PROGMEM -#include <ArduinoJson/Strings/FlashStringAdapter.hpp> -#include <ArduinoJson/Strings/SizedFlashStringAdapter.hpp> +#include "lib/ArduinoJson/Strings/FlashStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/SizedFlashStringAdapter.hpp" #endif diff --git a/include/lib/ArduinoJson/Variant/ConverterImpl.hpp b/include/lib/ArduinoJson/Variant/ConverterImpl.hpp index 34e12bb..fd3bf06 100644 --- a/include/lib/ArduinoJson/Variant/ConverterImpl.hpp +++ b/include/lib/ArduinoJson/Variant/ConverterImpl.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Strings/IsWriteableString.hpp> -#include <ArduinoJson/Variant/VariantFunctions.hpp> -#include <ArduinoJson/Variant/VariantRef.hpp> +#include "lib/ArduinoJson/Strings/IsWriteableString.hpp" +#include "lib/ArduinoJson/Variant/VariantFunctions.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/SlotFunctions.hpp b/include/lib/ArduinoJson/Variant/SlotFunctions.hpp index 74ac5a7..2ff4003 100644 --- a/include/lib/ArduinoJson/Variant/SlotFunctions.hpp +++ b/include/lib/ArduinoJson/Variant/SlotFunctions.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Polyfills/assert.hpp> -#include <ArduinoJson/Variant/VariantData.hpp> +#include "lib/ArduinoJson/Polyfills/assert.hpp" +#include "lib/ArduinoJson/Variant/VariantData.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantCompare.hpp b/include/lib/ArduinoJson/Variant/VariantCompare.hpp index 025ef90..f3ac8a8 100644 --- a/include/lib/ArduinoJson/Variant/VariantCompare.hpp +++ b/include/lib/ArduinoJson/Variant/VariantCompare.hpp @@ -4,12 +4,12 @@ #pragma once -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Misc/Visitable.hpp> -#include <ArduinoJson/Numbers/arithmeticCompare.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Strings/IsString.hpp> -#include <ArduinoJson/Variant/Visitor.hpp> +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Misc/Visitable.hpp" +#include "lib/ArduinoJson/Numbers/arithmeticCompare.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Variant/Visitor.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantContent.hpp b/include/lib/ArduinoJson/Variant/VariantContent.hpp index 47bf09c..5931304 100644 --- a/include/lib/ArduinoJson/Variant/VariantContent.hpp +++ b/include/lib/ArduinoJson/Variant/VariantContent.hpp @@ -6,9 +6,9 @@ #include <stddef.h> // size_t -#include <ArduinoJson/Collection/CollectionData.hpp> -#include <ArduinoJson/Numbers/Float.hpp> -#include <ArduinoJson/Numbers/Integer.hpp> +#include "lib/ArduinoJson/Collection/CollectionData.hpp" +#include "lib/ArduinoJson/Numbers/Float.hpp" +#include "lib/ArduinoJson/Numbers/Integer.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantData.hpp b/include/lib/ArduinoJson/Variant/VariantData.hpp index 82ae745..30a5bb9 100644 --- a/include/lib/ArduinoJson/Variant/VariantData.hpp +++ b/include/lib/ArduinoJson/Variant/VariantData.hpp @@ -4,11 +4,11 @@ #pragma once -#include <ArduinoJson/Memory/MemoryPool.hpp> -#include <ArduinoJson/Misc/SerializedValue.hpp> -#include <ArduinoJson/Numbers/convertNumber.hpp> -#include <ArduinoJson/Strings/RamStringAdapter.hpp> -#include <ArduinoJson/Variant/VariantContent.hpp> +#include "lib/ArduinoJson/Memory/MemoryPool.hpp" +#include "lib/ArduinoJson/Misc/SerializedValue.hpp" +#include "lib/ArduinoJson/Numbers/convertNumber.hpp" +#include "lib/ArduinoJson/Strings/RamStringAdapter.hpp" +#include "lib/ArduinoJson/Variant/VariantContent.hpp" // VariantData can't have a constructor (to be a POD), so we have no way to fix // this warning diff --git a/include/lib/ArduinoJson/Variant/VariantFunctions.hpp b/include/lib/ArduinoJson/Variant/VariantFunctions.hpp index 3fc9cbb..5015029 100644 --- a/include/lib/ArduinoJson/Variant/VariantFunctions.hpp +++ b/include/lib/ArduinoJson/Variant/VariantFunctions.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Polyfills/attributes.hpp> -#include <ArduinoJson/Variant/VariantData.hpp> +#include "lib/ArduinoJson/Polyfills/attributes.hpp" +#include "lib/ArduinoJson/Variant/VariantData.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantImpl.hpp b/include/lib/ArduinoJson/Variant/VariantImpl.hpp index b91e584..c29aeeb 100644 --- a/include/lib/ArduinoJson/Variant/VariantImpl.hpp +++ b/include/lib/ArduinoJson/Variant/VariantImpl.hpp @@ -4,12 +4,12 @@ #pragma once -#include <ArduinoJson/Array/ArrayRef.hpp> -#include <ArduinoJson/Configuration.hpp> -#include <ArduinoJson/Numbers/convertNumber.hpp> -#include <ArduinoJson/Numbers/parseNumber.hpp> -#include <ArduinoJson/Object/ObjectRef.hpp> -#include <ArduinoJson/Variant/VariantRef.hpp> +#include "lib/ArduinoJson/Array/ArrayRef.hpp" +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Numbers/convertNumber.hpp" +#include "lib/ArduinoJson/Numbers/parseNumber.hpp" +#include "lib/ArduinoJson/Object/ObjectRef.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.hpp" #include <string.h> // for strcmp diff --git a/include/lib/ArduinoJson/Variant/VariantOperators.hpp b/include/lib/ArduinoJson/Variant/VariantOperators.hpp index 54174a4..a716d71 100644 --- a/include/lib/ArduinoJson/Variant/VariantOperators.hpp +++ b/include/lib/ArduinoJson/Variant/VariantOperators.hpp @@ -4,11 +4,11 @@ #pragma once -#include <ArduinoJson/Misc/Visitable.hpp> -#include <ArduinoJson/Numbers/arithmeticCompare.hpp> -#include <ArduinoJson/Polyfills/attributes.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Variant/VariantTag.hpp> +#include "lib/ArduinoJson/Misc/Visitable.hpp" +#include "lib/ArduinoJson/Numbers/arithmeticCompare.hpp" +#include "lib/ArduinoJson/Polyfills/attributes.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Variant/VariantTag.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantRef.hpp b/include/lib/ArduinoJson/Variant/VariantRef.hpp index 8d4c410..08158d5 100644 --- a/include/lib/ArduinoJson/Variant/VariantRef.hpp +++ b/include/lib/ArduinoJson/Variant/VariantRef.hpp @@ -7,16 +7,16 @@ #include <stddef.h> #include <stdint.h> // for uint8_t -#include <ArduinoJson/Memory/MemoryPool.hpp> -#include <ArduinoJson/Misc/Visitable.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Strings/StringAdapters.hpp> -#include <ArduinoJson/Variant/Converter.hpp> -#include <ArduinoJson/Variant/VariantFunctions.hpp> -#include <ArduinoJson/Variant/VariantOperators.hpp> -#include <ArduinoJson/Variant/VariantRef.hpp> -#include <ArduinoJson/Variant/VariantShortcuts.hpp> -#include <ArduinoJson/Variant/VariantTag.hpp> +#include "lib/ArduinoJson/Memory/MemoryPool.hpp" +#include "lib/ArduinoJson/Misc/Visitable.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Strings/StringAdapters.hpp" +#include "lib/ArduinoJson/Variant/Converter.hpp" +#include "lib/ArduinoJson/Variant/VariantFunctions.hpp" +#include "lib/ArduinoJson/Variant/VariantOperators.hpp" +#include "lib/ArduinoJson/Variant/VariantRef.hpp" +#include "lib/ArduinoJson/Variant/VariantShortcuts.hpp" +#include "lib/ArduinoJson/Variant/VariantTag.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantShortcuts.hpp b/include/lib/ArduinoJson/Variant/VariantShortcuts.hpp index e62847f..df9108e 100644 --- a/include/lib/ArduinoJson/Variant/VariantShortcuts.hpp +++ b/include/lib/ArduinoJson/Variant/VariantShortcuts.hpp @@ -4,8 +4,8 @@ #pragma once -#include <ArduinoJson/Array/ArrayShortcuts.hpp> -#include <ArduinoJson/Object/ObjectShortcuts.hpp> +#include "lib/ArduinoJson/Array/ArrayShortcuts.hpp" +#include "lib/ArduinoJson/Object/ObjectShortcuts.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantSlot.hpp b/include/lib/ArduinoJson/Variant/VariantSlot.hpp index a271c1e..25be678 100644 --- a/include/lib/ArduinoJson/Variant/VariantSlot.hpp +++ b/include/lib/ArduinoJson/Variant/VariantSlot.hpp @@ -4,11 +4,11 @@ #pragma once -#include <ArduinoJson/Polyfills/integer.hpp> -#include <ArduinoJson/Polyfills/limits.hpp> -#include <ArduinoJson/Polyfills/type_traits.hpp> -#include <ArduinoJson/Strings/StoragePolicy.hpp> -#include <ArduinoJson/Variant/VariantContent.hpp> +#include "lib/ArduinoJson/Polyfills/integer.hpp" +#include "lib/ArduinoJson/Polyfills/limits.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" +#include "lib/ArduinoJson/Variant/VariantContent.hpp" namespace ARDUINOJSON_NAMESPACE { diff --git a/include/lib/ArduinoJson/Variant/VariantTag.hpp b/include/lib/ArduinoJson/Variant/VariantTag.hpp index 7164164..c8d94e4 100644 --- a/include/lib/ArduinoJson/Variant/VariantTag.hpp +++ b/include/lib/ArduinoJson/Variant/VariantTag.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/Variant/VariantTo.hpp b/include/lib/ArduinoJson/Variant/VariantTo.hpp index 352ecba..30845e4 100644 --- a/include/lib/ArduinoJson/Variant/VariantTo.hpp +++ b/include/lib/ArduinoJson/Variant/VariantTo.hpp @@ -4,7 +4,7 @@ #pragma once -#include <ArduinoJson/Namespace.hpp> +#include "lib/ArduinoJson/Namespace.hpp" namespace ARDUINOJSON_NAMESPACE { class ArrayRef; diff --git a/include/lib/ArduinoJson/Variant/Visitor.hpp b/include/lib/ArduinoJson/Variant/Visitor.hpp index 33237dd..dc9a487 100644 --- a/include/lib/ArduinoJson/Variant/Visitor.hpp +++ b/include/lib/ArduinoJson/Variant/Visitor.hpp @@ -4,9 +4,9 @@ #pragma once -#include <ArduinoJson/Collection/CollectionData.hpp> -#include <ArduinoJson/Numbers/Float.hpp> -#include <ArduinoJson/Numbers/Integer.hpp> +#include "lib/ArduinoJson/Collection/CollectionData.hpp" +#include "lib/ArduinoJson/Numbers/Float.hpp" +#include "lib/ArduinoJson/Numbers/Integer.hpp" namespace ARDUINOJSON_NAMESPACE { |