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

Merge branch 'master' into 6.x

Browse Source
This commit is contained in:
Benoit Blanchon
2018-10-09 15:00:49 +02:00
parent 5dc7dc1216 0d4a93018b
commit b11ad4077b
5 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ArduinoJson/JsonVariant.hpp
View File

@@ -305,9 +305,13 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
//
// bool is<const char*>() const;
// bool is<char*>() const;
// bool is<std::string>() const;
// bool is<String>() const;
template <typename T>
FORCE_INLINE typename enable_if<
is_same<T, const char *>::value || is_same<T, char *>::value, bool>::type
FORCE_INLINE typename enable_if<is_same<T, const char *>::value ||
is_same<T, char *>::value ||
IsWriteableString<T>::value,
bool>::type
is() const {
return _data && (_data->type == JSON_LINKED_STRING ||
_data->type == JSON_OWNED_STRING);