Selaa lähdekoodia

Rename `CollectionData.hpp` to `CollectionIterator.hpp`

I also removed some of the unused include statements.
Benoit Blanchon 3 kuukautta sitten
vanhempi
sitoutus
01de2f3fbb

+ 0 - 2
extras/tests/JsonDocument/constructor.cpp

@@ -8,8 +8,6 @@
 #include "Allocators.hpp"
 #include "Literals.hpp"
 
-using ArduinoJson::detail::addPadding;
-
 TEST_CASE("JsonDocument constructor") {
   SpyingAllocator spyingAllocator;
 

+ 2 - 0
extras/tests/MixedConfiguration/enable_alignment_0.cpp

@@ -2,6 +2,8 @@
 #define ARDUINOJSON_ENABLE_ALIGNMENT 0
 #include <ArduinoJson.h>
 
+#include <ArduinoJson/Memory/Alignment.hpp>
+
 #include <catch.hpp>
 
 TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 0") {

+ 2 - 0
extras/tests/MixedConfiguration/enable_alignment_1.cpp

@@ -1,6 +1,8 @@
 #define ARDUINOJSON_ENABLE_ALIGNMENT 1
 #include <ArduinoJson.h>
 
+#include <ArduinoJson/Memory/Alignment.hpp>
+
 #include <catch.hpp>
 
 TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 1") {

+ 2 - 0
extras/tests/ResourceManager/allocVariant.cpp

@@ -5,6 +5,8 @@
 #include <ArduinoJson.hpp>
 #include <catch.hpp>
 
+#include <ArduinoJson/Memory/Alignment.hpp>
+
 #include "Allocators.hpp"
 
 using namespace ArduinoJson::detail;

+ 1 - 5
src/ArduinoJson/Collection/CollectionImpl.hpp

@@ -4,11 +4,7 @@
 
 #pragma once
 
-#include <ArduinoJson/Collection/CollectionData.hpp>
-#include <ArduinoJson/Memory/Alignment.hpp>
-#include <ArduinoJson/Strings/StringAdapters.hpp>
-#include <ArduinoJson/Variant/VariantCompare.hpp>
-#include <ArduinoJson/Variant/VariantData.hpp>
+#include <ArduinoJson/Variant/VariantImpl.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 

+ 0 - 1
src/ArduinoJson/Collection/CollectionData.hpp → src/ArduinoJson/Collection/CollectionIterator.hpp

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <ArduinoJson/Memory/MemoryPool.hpp>
 #include <ArduinoJson/Namespace.hpp>
 #include <ArduinoJson/Polyfills/assert.hpp>
 

+ 1 - 1
src/ArduinoJson/Variant/VariantImpl.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <ArduinoJson/Collection/CollectionData.hpp>
+#include <ArduinoJson/Collection/CollectionIterator.hpp>
 #include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Misc/SerializedValue.hpp>
 #include <ArduinoJson/Numbers/convertNumber.hpp>