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

Fixed error "ambiguous overload for operator|" (fixes #1411)

Browse Source
This commit is contained in:
Benoit Blanchon
2020-10-22 09:30:31 +02:00
parent 1f7350658e
commit 2664a2d0da
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ArduinoJson/Variant/VariantOperators.hpp
View File

@ -20,22 +20,13 @@ struct VariantOperators {
// Returns the default value if the VariantRef is undefined of incompatible
template <typename T>
friend typename enable_if<!IsVisitable<T>::value, T>::type operator|(
const TVariant &variant, const T &defaultValue) {
const TVariant &variant, T defaultValue) {
if (variant.template is<T>())
return variant.template as<T>();
else
return defaultValue;
}
// Returns the default value if the VariantRef is undefined of incompatible
// Special case for string: null is treated as undefined
template <typename T>
friend typename enable_if<is_same<T, const char *>::value, T>::type operator|(
const TVariant &variant, T defaultValue) {
const char *value = variant.template as<const char *>();
return value ? value : defaultValue;
}
// value == TVariant
template <typename T>
friend bool operator==(T *lhs, TVariant rhs) {