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

Don't call operator VariantConstRef in VariantComparer

Browse Source
This commit is contained in:
Benoit Blanchon
2022-08-30 10:14:48 +02:00
parent ffa7f8d22d
commit 2b6bb78a09
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ArduinoJson/Variant/VariantCompare.hpp
View File

@@ -128,9 +128,9 @@ struct RawComparer : ComparerBase {
};
struct VariantComparer : ComparerBase {
VariantConstRef rhs;
const VariantData* rhs;
explicit VariantComparer(VariantConstRef value) : rhs(value) {}
explicit VariantComparer(const VariantData* value) : rhs(value) {}
CompareResult visitArray(const CollectionData& lhs) {
ArrayComparer comparer(lhs);
@@ -180,8 +180,7 @@ struct VariantComparer : ComparerBase {
private:
template <typename TComparer>
CompareResult accept(TComparer& comparer) {
CompareResult reversedResult =
variantAccept(VariantAttorney::getData(rhs), comparer);
CompareResult reversedResult = variantAccept(rhs, comparer);
switch (reversedResult) {
case COMPARE_RESULT_GREATER:
return COMPARE_RESULT_LESS;
@@ -198,7 +197,7 @@ struct Comparer<
T, typename enable_if<is_convertible<T, VariantConstRef>::value>::type>
: VariantComparer {
explicit Comparer(const T& value)
: VariantComparer(value.operator VariantConstRef()) {}
: VariantComparer(VariantAttorney::getData(value)) {}
};
template <typename T>