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

Reduced code size

Browse Source
This commit is contained in:
Benoit Blanchon
2018-10-18 11:15:32 +02:00
parent 9f1421e0a6
commit 4eee8e8bdf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ArduinoJson/JsonArraySubscript.hpp
View File

@ -44,22 +44,22 @@ class JsonArraySubscript : public JsonVariantBase<JsonArraySubscript>,
} }
FORCE_INLINE bool isNull() const { FORCE_INLINE bool isNull() const {
return _index >= _array.size(); return get_impl().isNull();
} }
template <typename T> template <typename T>
FORCE_INLINE typename JsonVariantAs<T>::type as() const { FORCE_INLINE typename JsonVariantAs<T>::type as() const {
return _array.get<T>(_index); return get_impl().as<T>();
} }
template <typename T> template <typename T>
FORCE_INLINE bool is() const { FORCE_INLINE bool is() const {
return _array.is<T>(_index); return get_impl().is<T>();
} }
template <typename T> template <typename T>
FORCE_INLINE typename JsonVariantTo<T>::type to() const { FORCE_INLINE typename JsonVariantTo<T>::type to() const {
return _array.get<JsonVariant>(_index).to<T>(); return get_impl().to<T>();
} }
// Replaces the value // Replaces the value
@ -89,7 +89,7 @@ class JsonArraySubscript : public JsonVariantBase<JsonArraySubscript>,
} }
private: private:
JsonVariant get_impl() const { FORCE_INLINE JsonVariant get_impl() const {
return _array.get<JsonVariant>(_index); return _array.get<JsonVariant>(_index);
} }

4
src/ArduinoJson/JsonObjectSubscript.hpp
View File

@ -98,11 +98,11 @@ class JsonObjectSubscript
} }
private: private:
JsonVariant get_impl() const { FORCE_INLINE JsonVariant get_impl() const {
return _object.get<JsonVariant>(_key); return _object.get<JsonVariant>(_key);
} }
JsonVariant set_impl() const { FORCE_INLINE JsonVariant set_impl() const {
return _object.set(_key); return _object.set(_key);
} }