Simplified JsonWriter hierarchy

This commit is contained in:
Benoit Blanchon
2014-11-03 12:58:52 +01:00
parent 2a60c96baf
commit 54f9bd9572
7 changed files with 14 additions and 55 deletions

View File

@ -10,7 +10,6 @@
#include "ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/JsonObject.hpp"
#include "ArduinoJson/Internals/CompactJsonWriter.hpp"
#include "ArduinoJson/Internals/PrettyJsonWriter.hpp"
using namespace ArduinoJson;
@ -91,5 +90,5 @@ void JsonArray::writeTo(T &writer) const {
}
}
template void JsonArray::writeTo<CompactJsonWriter>(CompactJsonWriter &) const;
template void JsonArray::writeTo<PrettyJsonWriter>(PrettyJsonWriter &) const;
template void JsonArray::writeTo(JsonWriter &) const;
template void JsonArray::writeTo(PrettyJsonWriter &) const;

View File

@ -12,7 +12,6 @@
#include "ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/JsonArray.hpp"
#include "ArduinoJson/JsonValue.hpp"
#include "ArduinoJson/Internals/CompactJsonWriter.hpp"
#include "ArduinoJson/Internals/PrettyJsonWriter.hpp"
#include "ArduinoJson/Internals/StringBuilder.hpp"
@ -116,5 +115,5 @@ void JsonObject::writeTo(T &writer) const {
}
}
template void JsonObject::writeTo(CompactJsonWriter &writer) const;
template void JsonObject::writeTo(JsonWriter &writer) const;
template void JsonObject::writeTo(PrettyJsonWriter &writer) const;

View File

@ -1,15 +0,0 @@
// Copyright Benoit Blanchon 2014
// MIT License
//
// Arduino JSON library
// https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/JsonPrintable.hpp"
#include "ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/Internals/StringBuilder.hpp"
#include "ArduinoJson/Internals/CompactJsonWriter.hpp"
#include "ArduinoJson/Internals/PrettyJsonWriter.hpp"
using namespace ArduinoJson;
using namespace ArduinoJson::Internals;

View File

@ -7,7 +7,6 @@
#include "ArduinoJson/JsonValue.hpp"
#include "ArduinoJson/JsonArray.hpp"
#include "ArduinoJson/JsonObject.hpp"
#include "ArduinoJson/Internals/CompactJsonWriter.hpp"
#include "ArduinoJson/Internals/PrettyJsonWriter.hpp"
using namespace ArduinoJson;
@ -104,5 +103,5 @@ void JsonValue::writeTo(T &writer) const {
}
}
template void JsonValue::writeTo<CompactJsonWriter>(CompactJsonWriter &) const;
template void JsonValue::writeTo<PrettyJsonWriter>(PrettyJsonWriter &) const;
template void JsonValue::writeTo(JsonWriter &) const;
template void JsonValue::writeTo(PrettyJsonWriter &) const;