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

Rename ArrayRef to JsonArray

Browse Source
This commit is contained in:
Benoit Blanchon
2022-12-19 12:10:58 +01:00
parent 208a22e324
commit 7079aa99d7
15 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArduinoJson/Variant/VariantConstRef.hpp
View File

@@ -20,7 +20,7 @@
namespace ARDUINOJSON_NAMESPACE {
// Forward declarations.
class ArrayRef;
class JsonArray;
class ObjectRef;
class VariantConstRef : public VariantTag,

6
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@@ -4,7 +4,7 @@
#pragma once
#include <ArduinoJson/Array/ArrayRef.hpp>
#include <ArduinoJson/Array/JsonArray.hpp>
#include <ArduinoJson/Configuration.hpp>
#include <ArduinoJson/Numbers/convertNumber.hpp>
#include <ArduinoJson/Numbers/parseNumber.hpp>
@@ -121,9 +121,9 @@ inline VariantRef VariantRefBase<TDerived>::getOrCreateVariant() const {
template <typename TDerived>
template <typename T>
inline typename enable_if<is_same<T, ArrayRef>::value, ArrayRef>::type
inline typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type
VariantRefBase<TDerived>::to() const {
return ArrayRef(getPool(), variantToArray(getOrCreateData()));
return JsonArray(getPool(), variantToArray(getOrCreateData()));
}
template <typename TDerived>

10
src/ArduinoJson/Variant/VariantRefBase.hpp
View File

@@ -74,9 +74,9 @@ class VariantRefBase : public VariantTag {
// Change the type of the variant
//
// ArrayRef to<ArrayRef>()
// JsonArray to<JsonArray>()
template <typename T>
typename enable_if<is_same<T, ArrayRef>::value, ArrayRef>::type to() const;
typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type to() const;
//
// ObjectRef to<ObjectRef>()
template <typename T>
@@ -199,7 +199,7 @@ class VariantRefBase : public VariantTag {
data->remove(adaptString(key));
}
FORCE_INLINE ArrayRef createNestedArray() const;
FORCE_INLINE JsonArray createNestedArray() const;
FORCE_INLINE ObjectRef createNestedObject() const;
FORCE_INLINE ElementProxy<TDerived> operator[](size_t index) const;
@@ -222,10 +222,10 @@ class VariantRefBase : public VariantTag {
operator[](TChar* key) const;
template <typename TString>
FORCE_INLINE ArrayRef createNestedArray(const TString& key) const;
FORCE_INLINE JsonArray createNestedArray(const TString& key) const;
template <typename TChar>
FORCE_INLINE ArrayRef createNestedArray(TChar* key) const;
FORCE_INLINE JsonArray createNestedArray(TChar* key) const;
template <typename TString>
ObjectRef createNestedObject(const TString& key) const;

6
src/ArduinoJson/Variant/VariantTo.hpp
View File

@@ -7,7 +7,7 @@
#include <ArduinoJson/Namespace.hpp>
namespace ARDUINOJSON_NAMESPACE {
class ArrayRef;
class JsonArray;
class ObjectRef;
class VariantRef;
@@ -17,8 +17,8 @@ template <typename T>
struct VariantTo {};
template <>
struct VariantTo<ArrayRef> {
typedef ArrayRef type;
struct VariantTo<JsonArray> {
typedef JsonArray type;
};
template <>
struct VariantTo<ObjectRef> {