github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 08:48:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed JsonVariant::invalid<T>() to JsonVariant::defaultValue<T>()

Browse Source
This commit is contained in:
Benoit Blanchon
2016-05-18 09:17:45 +02:00
parent a3a2ca4796
commit 9b3e3a3d9c
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/ArduinoJson/JsonObject.ipp
View File

@@ -21,7 +21,7 @@ inline JsonVariant JsonObject::get(JsonObjectKey key) const {
template <typename T>
inline T JsonObject::get(JsonObjectKey key) const {
node_type *node = getNodeAt(key.c_str());
return node ? node->content.value.as<T>() : JsonVariant::invalid<T>();
return node ? node->content.value.as<T>() : JsonVariant::defaultValue<T>();
}
template <typename T>
@@ -57,8 +57,7 @@ inline bool JsonObject::setNodeAt(JsonObjectKey key, T value) {
node_type *node = getNodeAt(key.c_str());
if (!node) {
node = addNewNode();
if (!node || !setNodeKey(node, key))
return false;
if (!node || !setNodeKey(node, key)) return false;
}
return setNodeValue<T>(node, value);
}
@@ -104,12 +103,12 @@ operator[](const String &key) const {
}
template <>
inline JsonObject const &JsonVariant::invalid<JsonObject const &>() {
inline JsonObject const &JsonVariant::defaultValue<JsonObject const &>() {
return JsonObject::invalid();
}
template <>
inline JsonObject &JsonVariant::invalid<JsonObject &>() {
inline JsonObject &JsonVariant::defaultValue<JsonObject &>() {
return JsonObject::invalid();
}