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

Fixed compilation error when index is not an int (issue #381)

Browse Source
This commit is contained in:
Benoit Blanchon
2016-11-13 20:19:36 +01:00
parent 1ce16ce449
commit f28157cab7
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ArduinoJson/Internals/StringFuncs.hpp
View File

@ -44,6 +44,7 @@ struct CharPtrFuncs {
}
static const bool has_append = false;
static const bool has_equals = true;
static const bool should_duplicate = false;
};
@ -56,6 +57,9 @@ struct StringFuncs<char*> : CharPtrFuncs {};
template <size_t N>
struct StringFuncs<char[N]> : CharPtrFuncs {};
template <size_t N>
struct StringFuncs<const char[N]> : CharPtrFuncs {};
template <typename TString>
struct StdStringFuncs {
template <typename Buffer>
@ -76,6 +80,7 @@ struct StdStringFuncs {
}
static const bool has_append = true;
static const bool has_equals = true;
static const bool should_duplicate = true;
};
@ -108,6 +113,7 @@ struct StringFuncs<const __FlashStringHelper*> {
}
static const bool has_append = false;
static const bool has_equals = true;
static const bool should_duplicate = true;
};
#endif

7
include/ArduinoJson/JsonObjectSubscript.hpp
View File

@ -84,13 +84,6 @@ template <typename TString>
inline JsonObjectSubscript<TString> JsonObject::operator[](const TString& key) {
return JsonObjectSubscript<TString>(*this, key);
}
template <typename TImplem>
template <class TString>
inline const JsonObjectSubscript<TString> JsonVariantBase<TImplem>::operator[](
const TString& key) const {
return asObject()[key];
}
} // namespace ArduinoJson
#ifdef _MSC_VER

8
include/ArduinoJson/JsonVariantBase.hpp
View File

@ -77,8 +77,12 @@ class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
// an object.
// Return JsonVariant::invalid() if the variant is not an object.
template <typename TString>
FORCE_INLINE const JsonObjectSubscript<TString> operator[](
const TString &key) const;
FORCE_INLINE
typename TypeTraits::EnableIf<Internals::StringFuncs<TString>::has_equals,
const JsonObjectSubscript<TString> >::type
operator[](const TString &key) const {
return asObject()[key];
}
private:
const TImpl *impl() const {