Skip to content

Commit a9996d2

Browse files
committed
VariantImpl: rename getResourceManager() to resources()
1 parent f9655a9 commit a9996d2

File tree

15 files changed

+21
-23
lines changed

15 files changed

+21
-23
lines changed

src/ArduinoJson/Array/ElementProxy.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ class ElementProxy : public VariantRefBase<ElementProxy<TUpstream>>,
5252

5353
VariantImpl getImpl() const {
5454
auto impl = VariantAttorney::getImpl(upstream_);
55-
return VariantImpl(impl.getElement(index_), impl.getResourceManager());
55+
return VariantImpl(impl.getElement(index_), impl.resources());
5656
}
5757

5858
VariantImpl getOrCreateImpl() const {
5959
auto impl = VariantAttorney::getOrCreateImpl(upstream_);
6060
auto data = impl.data();
6161
if (data)
6262
data->getOrCreateArray();
63-
return VariantImpl(impl.getOrAddElement(index_), impl.getResourceManager());
63+
return VariantImpl(impl.getOrAddElement(index_), impl.resources());
6464
}
6565

6666
TUpstream upstream_;

src/ArduinoJson/Array/JsonArray.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
5252
template <typename T, detail::enable_if_t<
5353
detail::is_same<T, JsonVariant>::value, int> = 0>
5454
JsonVariant add() const {
55-
return JsonVariant(impl_.addElement(), impl_.getResourceManager());
55+
return JsonVariant(impl_.addElement(), impl_.resources());
5656
}
5757

5858
// Appends a value to the array.

src/ArduinoJson/Array/JsonArrayConst.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
4444
template <typename T,
4545
detail::enable_if_t<detail::is_integral<T>::value, int> = 0>
4646
JsonVariantConst operator[](T index) const {
47-
return JsonVariantConst(impl_.getElement(size_t(index)),
48-
impl_.getResourceManager());
47+
return JsonVariantConst(impl_.getElement(size_t(index)), impl_.resources());
4948
}
5049

5150
// Returns the element at the specified index.

src/ArduinoJson/Collection/CollectionIterator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CollectionIterator {
2525
void next() {
2626
ARDUINOJSON_ASSERT(!done());
2727
auto nextId = value_.data()->next;
28-
auto resources = value_.getResourceManager();
28+
auto resources = value_.resources();
2929
value_ = VariantImpl(resources->getVariant(nextId), resources);
3030
currentId_ = nextId;
3131
}

src/ArduinoJson/Deserialization/deserialize.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ DeserializationError doDeserialize(TDestination&& dst, TReader reader,
4747
auto impl = VariantAttorney::getOrCreateImpl(dst);
4848
if (impl.isUnbound())
4949
return DeserializationError::NoMemory;
50-
auto resources = impl.getResourceManager();
50+
auto resources = impl.resources();
5151
dst.clear();
5252
auto err = TDeserializer<TReader>(resources, reader)
5353
.parse(impl.data(), options.filter, options.nestingLimit);

src/ArduinoJson/MsgPack/MsgPackBinary.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct Converter<MsgPackBinary> : private detail::VariantAttorney {
2929
auto data = impl.data();
3030
if (!data)
3131
return;
32-
auto resources = impl.getResourceManager();
32+
auto resources = impl.resources();
3333
impl.clear();
3434
if (src.data()) {
3535
size_t headerSize = src.size() >= 0x10000 ? 5

src/ArduinoJson/MsgPack/MsgPackExtension.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct Converter<MsgPackExtension> : private detail::VariantAttorney {
3333
static void toJson(MsgPackExtension src, JsonVariant dst) {
3434
auto impl = getImpl(dst);
3535
auto data = impl.data();
36-
auto resources = impl.getResourceManager();
36+
auto resources = impl.resources();
3737
if (!data)
3838
return;
3939
impl.clear();

src/ArduinoJson/Object/JsonObjectConst.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
9696
detail::enable_if_t<detail::IsString<TString>::value, int> = 0>
9797
JsonVariantConst operator[](const TString& key) const {
9898
return JsonVariantConst(impl_.getMember(detail::adaptString(key)),
99-
impl_.getResourceManager());
99+
impl_.resources());
100100
}
101101

102102
// Gets the member with specified key.
@@ -107,7 +107,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
107107
int> = 0>
108108
JsonVariantConst operator[](TChar* key) const {
109109
return JsonVariantConst(impl_.getMember(detail::adaptString(key)),
110-
impl_.getResourceManager());
110+
impl_.resources());
111111
}
112112

113113
// Gets the member with specified key.

src/ArduinoJson/Object/MemberProxy.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ class MemberProxy
5353

5454
VariantImpl getImpl() const {
5555
auto impl = VariantAttorney::getImpl(upstream_);
56-
return VariantImpl(impl.getMember(key_), impl.getResourceManager());
56+
return VariantImpl(impl.getMember(key_), impl.resources());
5757
}
5858

5959
VariantImpl getOrCreateImpl() const {
6060
auto impl = VariantAttorney::getOrCreateImpl(upstream_);
6161
auto data = impl.data();
6262
if (data)
6363
data->getOrCreateObject();
64-
return VariantImpl(impl.getOrAddMember(key_), impl.getResourceManager());
64+
return VariantImpl(impl.getOrAddMember(key_), impl.resources());
6565
}
6666

6767
private:

src/ArduinoJson/Serialization/measure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ template <template <typename> class TSerializer>
1212
size_t measure(ArduinoJson::JsonVariantConst source) {
1313
DummyWriter dp;
1414
auto impl = VariantAttorney::getImpl(source);
15-
TSerializer<DummyWriter> serializer(dp, impl.getResourceManager());
15+
TSerializer<DummyWriter> serializer(dp, impl.resources());
1616
return impl.accept(serializer);
1717
}
1818

0 commit comments

Comments
 (0)