github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +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

12
.travis.yml
View File

@@ -97,11 +97,19 @@ matrix:
- compiler: gcc - compiler: gcc
env: SCRIPT=coverage env: SCRIPT=coverage
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode7.3
compiler: clang compiler: clang
env: SCRIPT=cmake env: SCRIPT=cmake
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode8.3
compiler: clang
env: SCRIPT=cmake
- os: osx
osx_image: xcode9.4
compiler: clang
env: SCRIPT=cmake
- os: osx
osx_image: xcode10
compiler: clang compiler: clang
env: SCRIPT=cmake SANITIZE=address env: SCRIPT=cmake SANITIZE=address
- env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno - env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno

2
CHANGELOG.md
View File

@@ -9,6 +9,7 @@ HEAD
* Fixed object keys not being duplicated * Fixed object keys not being duplicated
* `JsonPair::key()` now returns a `JsonKey` * `JsonPair::key()` now returns a `JsonKey`
* Increased the default capacity of `DynamicJsonDocument` * Increased the default capacity of `DynamicJsonDocument`
* Fixed `JsonVariant::is<String>()` (closes #763)
v6.4.0-beta (2018-09-11) v6.4.0-beta (2018-09-11)
----------- -----------
@@ -87,6 +88,7 @@ v6.2.0-beta (2018-07-12)
----------- -----------
* Disabled lazy number deserialization (issue #772) * Disabled lazy number deserialization (issue #772)
* Fixed `JsonVariant::is<int>()` that returned true for empty strings
* Improved float serialization when `-fsingle-precision-constant` is used * Improved float serialization when `-fsingle-precision-constant` is used
* Renamed function `RawJson()` to `serialized()` * Renamed function `RawJson()` to `serialized()`
* `serializeMsgPack()` now supports values marked with `serialized()` * `serializeMsgPack()` now supports values marked with `serialized()`

2
appveyor.yml
View File

@@ -1,4 +1,4 @@
version: 6.0.1.{build} version: 6.4.0.{build}
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

8
src/ArduinoJson/JsonVariant.hpp
View File

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

1
test/JsonVariant/is.cpp
View File

@@ -79,6 +79,7 @@ void checkIsString(const char *value) {
var.set(value); var.set(value);
REQUIRE(var.is<const char *>()); REQUIRE(var.is<const char *>());
REQUIRE(var.is<std::string>());
REQUIRE_FALSE(var.is<bool>()); REQUIRE_FALSE(var.is<bool>());
REQUIRE_FALSE(var.is<int>()); REQUIRE_FALSE(var.is<int>());