Skip to content

Add .mbedignore file, exclude test code from mbed OS firmware. #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Add .mbedignore file, exclude test code from mbed OS firmware. #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4209561
Add .mbedignore file, to prevent test code from getting compiled into…
unu-iot Aug 17, 2016
409ca7e
Fixed `-Wparentheses` warning introduced in v5.6.5 (PR #335 by @nuket)
unu-iot Aug 17, 2016
1c5254d
Merge branch 'master' of github.com:nuket/ArduinoJson
unu-iot Aug 24, 2016
fcb8454
Fixes #334.
unu-iot Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .mbedignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.github/
examples/
scripts/
test/
third-party/
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
ArduinoJson: change log
=======================

HEAD
----

* Fixed `-Wparentheses` warning introduced in v5.6.5 (PR #335 by @nuket)

v5.6.5
------

Expand Down
4 changes: 2 additions & 2 deletions include/ArduinoJson/JsonVariant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
}
bool isString() const {
return _type == Internals::JSON_STRING ||
_type == Internals::JSON_UNPARSED && _content.asString &&
!strcmp("null", _content.asString);
(_type == Internals::JSON_UNPARSED && _content.asString &&
!strcmp("null", _content.asString));
}

// The current type of the variant
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-Wformat=2
-Winit-self
-Wmissing-include-dirs
-Wno-parentheses
-Wparentheses
-Wno-sign-conversion
-Wno-unused
-Wno-variadic-macros
Expand Down