feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Simplified deserializeJson() and deserializeMsgPack()

Browse Source
This commit is contained in:
Benoit Blanchon
2019-01-04 12:33:39 +01:00
parent 3d8ece8c8b
commit f0784d3b41
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ArduinoJson/Json/JsonDeserializer.hpp
View File

@ -336,24 +336,24 @@ class JsonDeserializer {
bool _loaded; bool _loaded;
}; };
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeJson(TDocument &doc, const TInput &input) { DeserializationError deserializeJson(JsonDocument &doc, const TInput &input) {
return deserialize<JsonDeserializer>(doc, input); return deserialize<JsonDeserializer>(doc, input);
} }
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeJson(TDocument &doc, TInput *input) { DeserializationError deserializeJson(JsonDocument &doc, TInput *input) {
return deserialize<JsonDeserializer>(doc, input); return deserialize<JsonDeserializer>(doc, input);
} }
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeJson(TDocument &doc, TInput *input, DeserializationError deserializeJson(JsonDocument &doc, TInput *input,
size_t inputSize) { size_t inputSize) {
return deserialize<JsonDeserializer>(doc, input, inputSize); return deserialize<JsonDeserializer>(doc, input, inputSize);
} }
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeJson(TDocument &doc, TInput &input) { DeserializationError deserializeJson(JsonDocument &doc, TInput &input) {
return deserialize<JsonDeserializer>(doc, input); return deserialize<JsonDeserializer>(doc, input);
} }
} // namespace ARDUINOJSON_NAMESPACE } // namespace ARDUINOJSON_NAMESPACE

17
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@ -326,24 +326,25 @@ class MsgPackDeserializer {
uint8_t _nestingLimit; uint8_t _nestingLimit;
}; };
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeMsgPack(TDocument &doc, const TInput &input) { DeserializationError deserializeMsgPack(JsonDocument &doc,
const TInput &input) {
return deserialize<MsgPackDeserializer>(doc, input); return deserialize<MsgPackDeserializer>(doc, input);
} }
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeMsgPack(TDocument &doc, TInput *input) { DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input) {
return deserialize<MsgPackDeserializer>(doc, input); return deserialize<MsgPackDeserializer>(doc, input);
} }
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeMsgPack(TDocument &doc, TInput *input, DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input,
size_t inputSize) { size_t inputSize) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize); return deserialize<MsgPackDeserializer>(doc, input, inputSize);
} }
template <typename TDocument, typename TInput> template <typename TInput>
DeserializationError deserializeMsgPack(TDocument &doc, TInput &input) { DeserializationError deserializeMsgPack(JsonDocument &doc, TInput &input) {
return deserialize<MsgPackDeserializer>(doc, input); return deserialize<MsgPackDeserializer>(doc, input);
} }
} // namespace ARDUINOJSON_NAMESPACE } // namespace ARDUINOJSON_NAMESPACE