Simplified deserializeJson() and deserializeMsgPack()

bblanchon · bblanchon · commit f0784d3b412f · 2019-01-04T12:33:39.000+01:00
diff --git a/src/ArduinoJson/Json/JsonDeserializer.hpp b/src/ArduinoJson/Json/JsonDeserializer.hpp
@@ -336,24 +336,24 @@ class JsonDeserializer {
   bool _loaded;
 };
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeJson(TDocument &doc, const TInput &input) {
+template <typename TInput>
+DeserializationError deserializeJson(JsonDocument &doc, const TInput &input) {
   return deserialize<JsonDeserializer>(doc, input);
 }
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeJson(TDocument &doc, TInput *input) {
+template <typename TInput>
+DeserializationError deserializeJson(JsonDocument &doc, TInput *input) {
   return deserialize<JsonDeserializer>(doc, input);
 }
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeJson(TDocument &doc, TInput *input,
+template <typename TInput>
+DeserializationError deserializeJson(JsonDocument &doc, TInput *input,
                                      size_t inputSize) {
   return deserialize<JsonDeserializer>(doc, input, inputSize);
 }
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeJson(TDocument &doc, TInput &input) {
+template <typename TInput>
+DeserializationError deserializeJson(JsonDocument &doc, TInput &input) {
   return deserialize<JsonDeserializer>(doc, input);
 }
 }  // namespace ARDUINOJSON_NAMESPACE
diff --git a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
@@ -326,24 +326,25 @@ class MsgPackDeserializer {
   uint8_t _nestingLimit;
 };
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeMsgPack(TDocument &doc, const TInput &input) {
+template <typename TInput>
+DeserializationError deserializeMsgPack(JsonDocument &doc,
+                                        const TInput &input) {
   return deserialize<MsgPackDeserializer>(doc, input);
 }
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeMsgPack(TDocument &doc, TInput *input) {
+template <typename TInput>
+DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input) {
   return deserialize<MsgPackDeserializer>(doc, input);
 }
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeMsgPack(TDocument &doc, TInput *input,
+template <typename TInput>
+DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input,
                                         size_t inputSize) {
   return deserialize<MsgPackDeserializer>(doc, input, inputSize);
 }
 
-template <typename TDocument, typename TInput>
-DeserializationError deserializeMsgPack(TDocument &doc, TInput &input) {
+template <typename TInput>
+DeserializationError deserializeMsgPack(JsonDocument &doc, TInput &input) {
   return deserialize<MsgPackDeserializer>(doc, input);
 }
 }  // namespace ARDUINOJSON_NAMESPACE
