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/Variant/ConverterImpl.hpp | 6 +++--- include/lib/ArduinoJson/Variant/SlotFunctions.hpp | 4 ++-- include/lib/ArduinoJson/Variant/VariantCompare.hpp | 12 ++++++------ include/lib/ArduinoJson/Variant/VariantContent.hpp | 6 +++--- include/lib/ArduinoJson/Variant/VariantData.hpp | 10 +++++----- include/lib/ArduinoJson/Variant/VariantFunctions.hpp | 4 ++-- include/lib/ArduinoJson/Variant/VariantImpl.hpp | 12 ++++++------ include/lib/ArduinoJson/Variant/VariantOperators.hpp | 10 +++++----- include/lib/ArduinoJson/Variant/VariantRef.hpp | 20 ++++++++++---------- include/lib/ArduinoJson/Variant/VariantShortcuts.hpp | 4 ++-- include/lib/ArduinoJson/Variant/VariantSlot.hpp | 10 +++++----- include/lib/ArduinoJson/Variant/VariantTag.hpp | 2 +- include/lib/ArduinoJson/Variant/VariantTo.hpp | 2 +- include/lib/ArduinoJson/Variant/Visitor.hpp | 6 +++--- 14 files changed, 54 insertions(+), 54 deletions(-) (limited to 'include/lib/ArduinoJson/Variant') 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 -#include -#include +#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 -#include +#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 -#include -#include -#include -#include -#include +#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 // size_t -#include -#include -#include +#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 -#include -#include -#include -#include +#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 -#include +#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 -#include -#include -#include -#include -#include +#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 // 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 -#include -#include -#include -#include +#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 #include // for uint8_t -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 -#include +#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 -#include -#include -#include -#include +#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 +#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 +#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 -#include -#include +#include "lib/ArduinoJson/Collection/CollectionData.hpp" +#include "lib/ArduinoJson/Numbers/Float.hpp" +#include "lib/ArduinoJson/Numbers/Integer.hpp" namespace ARDUINOJSON_NAMESPACE { -- cgit v1.2.3