Moved JsonBuffer to Memory/

src/ArduinoJson.hpp

@@ -5,11 +5,9 @@
 #pragma once
 
 #include "ArduinoJson/DynamicJsonArray.hpp"
-#include "ArduinoJson/DynamicJsonBuffer.hpp"
 #include "ArduinoJson/DynamicJsonObject.hpp"
 #include "ArduinoJson/DynamicJsonVariant.hpp"
 #include "ArduinoJson/StaticJsonArray.hpp"
-#include "ArduinoJson/StaticJsonBuffer.hpp"
 #include "ArduinoJson/StaticJsonObject.hpp"
 #include "ArduinoJson/StaticJsonVariant.hpp"
 #include "ArduinoJson/deserializeJson.hpp"

src/ArduinoJson/Data/List.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../JsonBuffer.hpp"
+#include "../Memory/JsonBuffer.hpp"
 #include "ListConstIterator.hpp"
 #include "ListIterator.hpp"
 

src/ArduinoJson/Data/ListNode.hpp

@@ -6,7 +6,7 @@
 
 #include <stddef.h>  // for NULL
 
-#include "JsonBufferAllocated.hpp"
+#include "../Memory/JsonBufferAllocated.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
@@ -20,5 +20,5 @@ struct ListNode : public Internals::JsonBufferAllocated {
   ListNode<T> *next;
   T content;
 };
-}
+}  // namespace Internals
-}
+}  // namespace ArduinoJson

src/ArduinoJson/Data/ValueSaver.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "../JsonBuffer.hpp"
 #include "../JsonVariant.hpp"
+#include "../Memory/JsonBuffer.hpp"
 #include "../StringTraits/StringTraits.hpp"
 #include "../TypeTraits/EnableIf.hpp"
 
@@ -48,5 +48,5 @@ struct ValueSaver<
     return true;
   }
 };
-}
+}  // namespace Internals
-}
+}  // namespace ArduinoJson

src/ArduinoJson/Deserialization/JsonParser.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "../JsonBuffer.hpp"
 #include "../JsonError.hpp"
 #include "../JsonVariant.hpp"
+#include "../Memory/JsonBuffer.hpp"
 #include "../TypeTraits/IsConst.hpp"
 #include "StringWriter.hpp"
 

src/ArduinoJson/DynamicJsonArray.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "DynamicJsonBuffer.hpp"
 #include "JsonArray.hpp"
+#include "Memory/DynamicJsonBuffer.hpp"
 
 namespace ArduinoJson {
 class DynamicJsonArray : public JsonArray {

src/ArduinoJson/DynamicJsonObject.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "DynamicJsonBuffer.hpp"
 #include "JsonObject.hpp"
+#include "Memory/DynamicJsonBuffer.hpp"
 
 namespace ArduinoJson {
 class DynamicJsonObject : public JsonObject {

src/ArduinoJson/DynamicJsonVariant.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "DynamicJsonBuffer.hpp"
 #include "JsonVariant.hpp"
+#include "Memory/DynamicJsonBuffer.hpp"
 
 namespace ArduinoJson {
 

src/ArduinoJson/JsonArray.hpp

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "Data/JsonBufferAllocated.hpp"
 #include "Data/List.hpp"
 #include "Data/ReferenceType.hpp"
 #include "Data/ValueSaver.hpp"
 #include "JsonVariant.hpp"
+#include "Memory/JsonBufferAllocated.hpp"
 #include "StringTraits/StringTraits.hpp"
 #include "TypeTraits/EnableIf.hpp"
 #include "TypeTraits/IsArray.hpp"
@@ -34,7 +34,7 @@ class JsonArray : public Internals::ReferenceType,
                   public Internals::List<JsonVariant>,
                   public Internals::JsonBufferAllocated {
  public:
-  explicit JsonArray(JsonBuffer *buf) throw()
+  explicit JsonArray(Internals::JsonBuffer *buf) throw()
       : Internals::List<JsonVariant>(buf) {}
 
   // Gets the value at the specified index

src/ArduinoJson/JsonObject.hpp

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "Data/JsonBufferAllocated.hpp"
 #include "Data/List.hpp"
 #include "Data/ReferenceType.hpp"
 #include "Data/ValueSaver.hpp"
 #include "JsonPair.hpp"
+#include "Memory/JsonBufferAllocated.hpp"
 #include "StringTraits/StringTraits.hpp"
 #include "TypeTraits/EnableIf.hpp"
 #include "TypeTraits/IsArray.hpp"
@@ -37,7 +37,7 @@ class JsonObject : public Internals::ReferenceType,
  public:
   // Create an empty JsonArray attached to the specified JsonBuffer.
   // You should not use this constructor directly.
-  explicit JsonObject(JsonBuffer* buf) throw()
+  explicit JsonObject(Internals::JsonBuffer* buf) throw()
       : Internals::List<JsonPair>(buf) {}
 
   // Gets or sets the value associated with the specified key.

src/ArduinoJson/Memory/JsonBuffer.hpp

@@ -8,21 +8,16 @@
 #include <stdint.h>  // for uint8_t
 #include <string.h>
 
-#include "Data/NonCopyable.hpp"
+#include "../Configuration.hpp"
-#include "JsonVariant.hpp"
+#include "../Polyfills/NonCopyable.hpp"
-#include "TypeTraits/EnableIf.hpp"
+#include "../Polyfills/attributes.hpp"
-#include "TypeTraits/IsArray.hpp"
 
 namespace ArduinoJson {
-class JsonArray;
+namespace Internals {
-class JsonObject;
-
-// Entry point for using the library.
-//
 // Handle the memory management (done in derived classes) and calls the parser.
 // This abstract class is implemented by StaticJsonBuffer which implements a
 // fixed memory allocation.
-class JsonBuffer : Internals::NonCopyable {
+class JsonBuffer : NonCopyable {
  public:
   // Allocates n bytes in the JsonBuffer.
   // Return a pointer to the allocated memory or NULL if allocation fails.
@@ -44,4 +39,5 @@ class JsonBuffer : Internals::NonCopyable {
 #endif
   }
 };
+}  // namespace Internals
 }  // namespace ArduinoJson

src/ArduinoJson/Memory/JsonBufferAllocated.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../JsonBuffer.hpp"
+#include "JsonBuffer.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
@@ -18,5 +18,5 @@ class JsonBufferAllocated {
 
   void operator delete(void *, JsonBuffer *)throw();
 };
-}
+}  // namespace Internals
-}
+}  // namespace ArduinoJson

src/ArduinoJson/Memory/StaticJsonBuffer.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
+#include "../TypeTraits/Max.hpp"
 #include "JsonBuffer.hpp"
-#include "TypeTraits/Max.hpp"
 
 namespace ArduinoJson {
 namespace Internals {

src/ArduinoJson/StaticJsonArray.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "JsonArray.hpp"
-#include "StaticJsonBuffer.hpp"
+#include "Memory/StaticJsonBuffer.hpp"
 
 namespace ArduinoJson {
 

src/ArduinoJson/StaticJsonObject.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "JsonObject.hpp"
-#include "StaticJsonBuffer.hpp"
+#include "Memory/StaticJsonBuffer.hpp"
 
 namespace ArduinoJson {
 

src/ArduinoJson/StaticJsonVariant.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "JsonVariant.hpp"
-#include "StaticJsonBuffer.hpp"
+#include "Memory/StaticJsonBuffer.hpp"
 
 namespace ArduinoJson {