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/Strings/ArduinoStringAdapter.hpp | 6 +++--- include/lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp | 10 +++++----- include/lib/ArduinoJson/Strings/FlashStringAdapter.hpp | 8 ++++---- include/lib/ArduinoJson/Strings/IsString.hpp | 2 +- include/lib/ArduinoJson/Strings/IsWriteableString.hpp | 4 ++-- include/lib/ArduinoJson/Strings/RamStringAdapter.hpp | 6 +++--- .../lib/ArduinoJson/Strings/SizedFlashStringAdapter.hpp | 8 ++++---- include/lib/ArduinoJson/Strings/SizedRamStringAdapter.hpp | 6 +++--- include/lib/ArduinoJson/Strings/StdStringAdapter.hpp | 6 +++--- include/lib/ArduinoJson/Strings/String.hpp | 6 +++--- include/lib/ArduinoJson/Strings/StringAdapters.hpp | 14 +++++++------- 11 files changed, 38 insertions(+), 38 deletions(-) (limited to 'include/lib/ArduinoJson/Strings') 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 -#include -#include -#include +#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 // size_t #include // strcmp -#include -#include -#include +#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 : true_type {}; -template -struct IsString : true_type {}; +template +struct IsString : 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 -#include -#include -#include +#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 +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" namespace ARDUINOJSON_NAMESPACE { template 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 -#include +#include "lib/ArduinoJson/Configuration.hpp" +#include "lib/ArduinoJson/Polyfills/type_traits.hpp" #if ARDUINOJSON_ENABLE_ARDUINO_STRING #include 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 -#include -#include +#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 -#include -#include -#include +#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 -#include -#include +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" #include // 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 -#include -#include +#include "lib/ArduinoJson/Namespace.hpp" +#include "lib/ArduinoJson/Strings/IsString.hpp" +#include "lib/ArduinoJson/Strings/StoragePolicy.hpp" #include 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 -#include -#include +#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 -#include -#include +#include "lib/ArduinoJson/Strings/ConstRamStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/RamStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/SizedRamStringAdapter.hpp" #if ARDUINOJSON_ENABLE_STD_STRING -#include +#include "lib/ArduinoJson/Strings/StdStringAdapter.hpp" #endif #if ARDUINOJSON_ENABLE_ARDUINO_STRING -#include +#include "lib/ArduinoJson/Strings/ArduinoStringAdapter.hpp" #endif #if ARDUINOJSON_ENABLE_PROGMEM -#include -#include +#include "lib/ArduinoJson/Strings/FlashStringAdapter.hpp" +#include "lib/ArduinoJson/Strings/SizedFlashStringAdapter.hpp" #endif -- cgit v1.2.3