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

Swap the parameters of JsonObject's constructor

Browse Source
This commit is contained in:
Benoit Blanchon
2023-06-20 18:08:21 +02:00
parent e96680eb29
commit ba8d102432
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ArduinoJson/Object/JsonObject.hpp
View File

@ -23,9 +23,9 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
FORCE_INLINE JsonObject() : data_(0), resources_(0) {} FORCE_INLINE JsonObject() : data_(0), resources_(0) {}
// INTERNAL USE ONLY // INTERNAL USE ONLY
FORCE_INLINE JsonObject(detail::ResourceManager* buf, FORCE_INLINE JsonObject(detail::CollectionData* data,
detail::CollectionData* data) detail::ResourceManager* resource)
: data_(data), resources_(buf) {} : data_(data), resources_(resource) {}
operator JsonVariant() const { operator JsonVariant() const {
void* data = data_; // prevent warning cast-align void* data = data_; // prevent warning cast-align
@ -219,7 +219,7 @@ struct Converter<JsonObject> : private detail::VariantAttorney {
static JsonObject fromJson(JsonVariant src) { static JsonObject fromJson(JsonVariant src) {
auto data = getData(src); auto data = getData(src);
auto resources = getResourceManager(src); auto resources = getResourceManager(src);
return JsonObject(resources, data != 0 ? data->asObject() : 0); return JsonObject(data != 0 ? data->asObject() : 0, resources);
} }
static detail::InvalidConversion<JsonVariantConst, JsonObject> fromJson( static detail::InvalidConversion<JsonVariantConst, JsonObject> fromJson(
@ -243,8 +243,8 @@ template <typename TDerived>
template <typename T> template <typename T>
typename enable_if<is_same<T, JsonObject>::value, JsonObject>::type typename enable_if<is_same<T, JsonObject>::value, JsonObject>::type
VariantRefBase<TDerived>::to() const { VariantRefBase<TDerived>::to() const {
return JsonObject(getResourceManager(), return JsonObject(variantToObject(getOrCreateData(), getResourceManager()),
variantToObject(getOrCreateData(), getResourceManager())); getResourceManager());
} }
ARDUINOJSON_END_PRIVATE_NAMESPACE ARDUINOJSON_END_PRIVATE_NAMESPACE