Removed ForwardDeclarations.hpp

This commit is contained in:
Benoit Blanchon
2014-10-31 12:27:33 +01:00
parent ca0fbf00f9
commit d35b680481
8 changed files with 29 additions and 32 deletions

View File

@ -1,18 +0,0 @@
// Copyright Benoit Blanchon 2014
// MIT License
//
// Arduino JSON library
// https://github.com/bblanchon/ArduinoJson
#pragma once
namespace ArduinoJson {
class JsonArray;
class JsonBuffer;
class JsonObject;
namespace Internals {
class IndentedPrint;
class JsonWriter;
}
}

View File

@ -6,9 +6,11 @@
#pragma once #pragma once
#include "../ForwardDeclarations.hpp"
namespace ArduinoJson { namespace ArduinoJson {
class JsonArray;
class JsonObject;
namespace Internals { namespace Internals {
union JsonValueContent { union JsonValueContent {

View File

@ -6,18 +6,19 @@
#pragma once #pragma once
#include "ForwardDeclarations.hpp"
#include "JsonArrayIterator.hpp"
#include "JsonArrayConstIterator.hpp"
#include "JsonPrintable.hpp"
#include "JsonObject.hpp"
#include "Internals/ReferenceType.hpp" #include "Internals/ReferenceType.hpp"
#include "JsonArrayConstIterator.hpp"
#include "JsonArrayIterator.hpp"
#include "JsonPrintable.hpp"
#define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \ #define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \
(sizeof(JsonArray) + (NUMBER_OF_ELEMENTS) * sizeof(Internals::JsonArrayNode)) (sizeof(JsonArray) + (NUMBER_OF_ELEMENTS) * sizeof(Internals::JsonArrayNode))
namespace ArduinoJson { namespace ArduinoJson {
class JsonObject;
class JsonBuffer;
class JsonArray : public JsonPrintable, public Internals::ReferenceType { class JsonArray : public JsonPrintable, public Internals::ReferenceType {
friend class JsonBuffer; friend class JsonBuffer;

View File

@ -6,10 +6,11 @@
#pragma once #pragma once
#include "ForwardDeclarations.hpp"
#include "JsonValue.hpp" #include "JsonValue.hpp"
namespace ArduinoJson { namespace ArduinoJson {
class JsonArray;
class JsonObject;
class JsonBuffer { class JsonBuffer {
public: public:

View File

@ -6,9 +6,7 @@
#pragma once #pragma once
#include "Internals/JsonObjectNode.hpp"
#include "Internals/ReferenceType.hpp" #include "Internals/ReferenceType.hpp"
#include "JsonArray.hpp"
#include "JsonObjectConstIterator.hpp" #include "JsonObjectConstIterator.hpp"
#include "JsonObjectIterator.hpp" #include "JsonObjectIterator.hpp"
#include "JsonPrintable.hpp" #include "JsonPrintable.hpp"
@ -19,6 +17,9 @@
namespace ArduinoJson { namespace ArduinoJson {
class JsonArray;
class JsonBuffer;
class JsonObject : public JsonPrintable, public Internals::ReferenceType { class JsonObject : public JsonPrintable, public Internals::ReferenceType {
friend class JsonBuffer; friend class JsonBuffer;

View File

@ -7,7 +7,6 @@
#pragma once #pragma once
#include "JsonValue.hpp" #include "JsonValue.hpp"
#include "Internals/JsonObjectNode.hpp"
namespace ArduinoJson { namespace ArduinoJson {

View File

@ -6,11 +6,15 @@
#pragma once #pragma once
#include "ForwardDeclarations.hpp"
#include "Arduino/Printable.hpp" #include "Arduino/Printable.hpp"
namespace ArduinoJson { namespace ArduinoJson {
namespace Internals {
class IndentedPrint;
class JsonWriter;
}
class JsonPrintable : public Printable { class JsonPrintable : public Printable {
public: public:
size_t printTo(char *buffer, size_t bufferSize) const; size_t printTo(char *buffer, size_t bufferSize) const;

View File

@ -8,11 +8,18 @@
#include <stddef.h> #include <stddef.h>
#include "ForwardDeclarations.hpp"
#include "Internals/JsonValueContent.hpp" #include "Internals/JsonValueContent.hpp"
#include "Internals/JsonValueType.hpp" #include "Internals/JsonValueType.hpp"
namespace ArduinoJson { namespace ArduinoJson {
class JsonArray;
class JsonObject;
namespace Internals {
class JsonWriter;
}
class JsonValue { class JsonValue {
public: public:
JsonValue() : _type(Internals::JSON_UNDEFINED) {} JsonValue() : _type(Internals::JSON_UNDEFINED) {}