Skip to content

Commit 1232f61

Browse files
committed
VariantImpl: change setRawString() to return bool
1 parent 65518a8 commit 1232f61

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/ArduinoJson/Variant/ConverterImpl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ inline detail::enable_if_t<detail::IsString<T>::value, bool> convertToJson(
168168
// SerializedValue<const __FlashStringHelper*>
169169
template <typename T>
170170
struct Converter<SerializedValue<T>> : private detail::VariantAttorney {
171-
static void toJson(SerializedValue<T> src, JsonVariant dst) {
172-
getVariantImpl(dst).setRawString(
171+
static bool toJson(SerializedValue<T> src, JsonVariant dst) {
172+
return getVariantImpl(dst).setRawString(
173173
detail::adaptString(src.data(), src.size()));
174174
}
175175
};

src/ArduinoJson/Variant/VariantImpl.hpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,13 +488,15 @@ class VariantImpl {
488488
}
489489

490490
template <typename TAdaptedString>
491-
void setRawString(TAdaptedString value) {
491+
bool setRawString(TAdaptedString value) {
492492
if (!data_)
493-
return;
493+
return false;
494494
clear(data_, resources_);
495495
auto dup = resources_->saveString(adaptString(value.data(), value.size()));
496-
if (dup)
497-
data_->setRawString(dup);
496+
if (!dup)
497+
return false;
498+
data_->setRawString(dup);
499+
return true;
498500
}
499501

500502
template <typename TAdaptedString>

0 commit comments

Comments
 (0)