Skip to content

Commit 38f61d3

Browse files
committed
VariantImpl: change setRawString() to return bool
1 parent 3793996 commit 38f61d3

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
@@ -173,10 +173,10 @@ inline detail::enable_if_t<detail::IsString<T>::value> convertToJson(
173173
// SerializedValue<const __FlashStringHelper*>
174174
template <typename T>
175175
struct Converter<SerializedValue<T>> : private detail::VariantAttorney {
176-
static void toJson(SerializedValue<T> src, JsonVariant dst) {
176+
static bool toJson(SerializedValue<T> src, JsonVariant dst) {
177177
auto variant = getImpl(dst);
178178
variant.clear();
179-
variant.setRawString(detail::adaptString(src.data(), src.size()));
179+
return variant.setRawString(detail::adaptString(src.data(), src.size()));
180180
}
181181
};
182182

src/ArduinoJson/Variant/VariantImpl.hpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -441,12 +441,14 @@ class VariantImpl {
441441
}
442442

443443
template <typename TAdaptedString>
444-
void setRawString(TAdaptedString value) {
444+
bool setRawString(TAdaptedString value) {
445445
if (!data_)
446-
return;
446+
return false;
447447
auto dup = resources_->saveString(value);
448-
if (dup)
449-
data_->setRawString(dup);
448+
if (!dup)
449+
return false;
450+
data_->setRawString(dup);
451+
return true;
450452
}
451453

452454
template <typename TAdaptedString>

0 commit comments

Comments
 (0)