From f0784d3b412f0ae1d22e11b5ae865887cb33e2b2 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Fri, 4 Jan 2019 12:33:39 +0100 Subject: [PATCH] Simplified deserializeJson() and deserializeMsgPack() --- src/ArduinoJson/Json/JsonDeserializer.hpp | 16 ++++++++-------- src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp | 17 +++++++++-------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/ArduinoJson/Json/JsonDeserializer.hpp b/src/ArduinoJson/Json/JsonDeserializer.hpp index e69e43ca..4faec78a 100644 --- a/src/ArduinoJson/Json/JsonDeserializer.hpp +++ b/src/ArduinoJson/Json/JsonDeserializer.hpp @@ -336,24 +336,24 @@ class JsonDeserializer { bool _loaded; }; -template -DeserializationError deserializeJson(TDocument &doc, const TInput &input) { +template +DeserializationError deserializeJson(JsonDocument &doc, const TInput &input) { return deserialize(doc, input); } -template -DeserializationError deserializeJson(TDocument &doc, TInput *input) { +template +DeserializationError deserializeJson(JsonDocument &doc, TInput *input) { return deserialize(doc, input); } -template -DeserializationError deserializeJson(TDocument &doc, TInput *input, +template +DeserializationError deserializeJson(JsonDocument &doc, TInput *input, size_t inputSize) { return deserialize(doc, input, inputSize); } -template -DeserializationError deserializeJson(TDocument &doc, TInput &input) { +template +DeserializationError deserializeJson(JsonDocument &doc, TInput &input) { return deserialize(doc, input); } } // namespace ARDUINOJSON_NAMESPACE diff --git a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp index a2f6a51c..42ced9df 100644 --- a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp @@ -326,24 +326,25 @@ class MsgPackDeserializer { uint8_t _nestingLimit; }; -template -DeserializationError deserializeMsgPack(TDocument &doc, const TInput &input) { +template +DeserializationError deserializeMsgPack(JsonDocument &doc, + const TInput &input) { return deserialize(doc, input); } -template -DeserializationError deserializeMsgPack(TDocument &doc, TInput *input) { +template +DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input) { return deserialize(doc, input); } -template -DeserializationError deserializeMsgPack(TDocument &doc, TInput *input, +template +DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input, size_t inputSize) { return deserialize(doc, input, inputSize); } -template -DeserializationError deserializeMsgPack(TDocument &doc, TInput &input) { +template +DeserializationError deserializeMsgPack(JsonDocument &doc, TInput &input) { return deserialize(doc, input); } } // namespace ARDUINOJSON_NAMESPACE