Set version to 6.9.1

.travis.yml

@@ -2,122 +2,109 @@ sudo: false
 language: cpp
 matrix:
   include:
-    - compiler: gcc
-      addons:
+    - addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-4.4']
+      env: SCRIPT=test _CC=gcc-4.4 _CXX=g++-4.4
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.6']
-      env: SCRIPT=cmake GCC=4.6
-    - compiler: gcc
-      addons:
+      env: SCRIPT=test _CC=gcc-4.6 _CXX=g++-4.6
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.7']
-      env: SCRIPT=cmake GCC=4.7
-    - compiler: gcc
-      addons:
+      env: SCRIPT=test _CC=gcc-4.7 _CXX=g++-4.7
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.8']
-      env: SCRIPT=cmake GCC=4.8 SANITIZE=address
-    - compiler: gcc
-      addons:
+      env: SCRIPT=test _CC=gcc-4.8 _CXX=g++-4.8 SANITIZE=address
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.9']
-      env: SCRIPT=cmake GCC=4.9 SANITIZE=leak
-    - compiler: gcc
-      addons:
+      env: SCRIPT=test _CC=gcc-4.9 _CXX=g++-4.9 SANITIZE=leak
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-5']
-      env: SCRIPT=cmake GCC=5 # SANITIZE=undefined 
-    - compiler: gcc
-      addons:
+      env: SCRIPT=test _CC=gcc-5 _CXX=g++-5 # SANITIZE=undefined 
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-6']
-      env: SCRIPT=cmake GCC=6
-    - compiler: gcc
-      addons:
+      env: SCRIPT=test _CC=gcc-6 _CXX=g++-6
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-7']
-      env: SCRIPT=cmake GCC=7
-    - compiler: clang
-      env: SCRIPT=cmake
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=gcc-7 _CXX=g++-7
+    - addons:
+        apt:
+          packages: ['g++-arm-linux-gnueabihf']
+      env: SCRIPT=build _CC=arm-linux-gnueabihf-gcc _CXX=arm-linux-gnueabihf-g++
+    - env: SCRIPT=test _CC=clang _CXX=clang++
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5']
           packages: ['clang-3.5']
-      env: SCRIPT=cmake CLANG=3.5 SANITIZE=address
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=clang-3.5 _CXX=clang++-3.5 SANITIZE=address
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6']
           packages: ['clang-3.6']
-      env: SCRIPT=cmake CLANG=3.6 SANITIZE=leak
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=clang-3.6 _CXX=clang++-3.6 SANITIZE=leak
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.7']
           packages: ['clang-3.7']
-      env: SCRIPT=cmake CLANG=3.7
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=clang-3.7 _CXX=clang++-3.7
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.8']
           packages: ['clang-3.8']
-      env: SCRIPT=cmake CLANG=3.8 SANITIZE=undefined
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=clang-3.8 _CXX=clang++-3.8 SANITIZE=undefined
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.9']
           packages: ['clang-3.9']
-      env: SCRIPT=cmake CLANG=3.9
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=clang-3.9 _CXX=clang++-3.9
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-4.0']
           packages: ['clang-4.0']
-      env: SCRIPT=cmake CLANG=4.0
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=clang-4.0 _CXX=clang++-4.0
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-5.0']
           packages: ['clang-5.0']
-      env: SCRIPT=cmake CLANG=5.0
-    - compiler: clang
-      addons:
+      env: SCRIPT=test _CC=clang-5.0 _CXX=clang++-5.0
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
           packages: ['clang-6.0']
-      env: SCRIPT=cmake CLANG=6.0
-    - compiler: gcc
-      env: SCRIPT=coverage
+      env: SCRIPT=test _CC=clang-6.0 _CXX=clang++-6.0
+    - env: SCRIPT=coverage
     - os: osx
       osx_image: xcode7.3
-      compiler: clang
-      env: SCRIPT=cmake
+      env: SCRIPT=test
     - os: osx
       osx_image: xcode8.3
-      compiler: clang
-      env: SCRIPT=cmake
+      env: SCRIPT=test
     - os: osx
       osx_image: xcode9.4
-      compiler: clang
-      env: SCRIPT=cmake
+      env: SCRIPT=test
     - os: osx
       osx_image: xcode10
-      compiler: clang
-      env: SCRIPT=cmake SANITIZE=address
+      env: SCRIPT=test SANITIZE=address
     - env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
     - env: SCRIPT=arduino VERSION=1.8.2 BOARD=arduino:samd:mkr1000
     - env: SCRIPT=platformio BOARD=uno
     - env: SCRIPT=platformio BOARD=esp01
-    - compiler: clang
-      addons:
+    - addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
           packages: ['clang-6.0','llvm-6.0']

CHANGELOG.md

@@ -1,6 +1,17 @@
 ArduinoJson: change log
 =======================
 
+v6.9.1 (2019-03-01)
+------
+
+* Fixed warning "unused variable" with GCC 4.4 (issue #912)
+* Fixed warning "cast  increases required alignment" (issue #914)
+* Fixed warning "conversion may alter value" (issue #914)
+* Fixed naming conflict with "CAPACITY" (issue #839)
+* Muted warning "will change in GCC 7.1" (issue #914)
+* Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
+* Marked ArduinoJson.h  as a "system header"
+
 v6.9.0 (2019-02-26)
 ------
 

README.md

@@ -2,7 +2,7 @@
 
 ---
 
-[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.9.0)](https://www.ardu-badge.com/ArduinoJson/6.9.0)
+[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.9.1)](https://www.ardu-badge.com/ArduinoJson/6.9.1)
 [![Build Status](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
 [![Build Status](https://travis-ci.org/bblanchon/ArduinoJson.svg?branch=6.x)](https://travis-ci.org/bblanchon/ArduinoJson)
 [![Coverage Status](https://coveralls.io/repos/github/bblanchon/ArduinoJson/badge.svg?branch=6.x)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)

library.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "version": "6.9.0",
+  "version": "6.9.1",
   "authors": {
     "name": "Benoit Blanchon",
     "url": "https://blog.benoitblanchon.fr"

library.properties

@@ -1,5 +1,5 @@
 name=ArduinoJson
-version=6.9.0
+version=6.9.1
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=An efficient and elegant JSON library for Arduino.

scripts/travis/build.sh

@@ -0,0 +1,14 @@
+#!/bin/sh -ex
+
+export CC="$_CC"
+export CXX="$_CXX"
+
+if [ -n "$SANITIZE" ]; then
+	export CXXFLAGS="-fsanitize=$SANITIZE"
+	BUILD_TYPE="Debug"
+else
+	BUILD_TYPE="Release"
+fi
+
+cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
+cmake --build .

scripts/travis/cmake.sh

@@ -1,30 +0,0 @@
-#!/bin/sh -ex
-
-if [ $(uname) = 'Darwin' ]; then
-	URL=https://cmake.org/files/v3.4/cmake-3.4.3-Darwin-x86_64.tar.gz
-	CMAKE=/tmp/CMake.app/Contents/bin/cmake
-	CTEST=/tmp/CMake.app/Contents/bin/ctest
-else
-	URL=https://cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.tar.gz
-	CMAKE=/tmp/bin/cmake
-	CTEST=/tmp/bin/ctest
-fi
-curl -sS $URL | tar xz -C /tmp --strip 1
-
-if [ -n "$GCC" ]; then
-	export CC="gcc-$GCC"
-	export CXX="g++-$GCC"
-fi
-
-if [ -n "$CLANG" ]; then
-	export CC="clang-$CLANG"
-	export CXX="clang++-$CLANG"
-fi
-
-if [ -n "$SANITIZE" ]; then
-	export CXXFLAGS="-fsanitize=$SANITIZE"
-fi
-
-$CMAKE .
-$CMAKE --build .
-$CTEST --output-on-failure .

scripts/travis/coverage.sh

@@ -1,8 +1,6 @@
 #!/bin/sh -eux
 
-curl https://cmake.org/files/v3.4/cmake-3.4.0-Linux-x86_64.tar.gz | tar xz -C /tmp --strip 1
-
-/tmp/bin/cmake -DCOVERAGE=true .
+cmake -DCOVERAGE=true .
 make 
 make test
 

scripts/travis/test.sh

@@ -0,0 +1,4 @@
+#!/bin/sh -ex
+
+"$(dirname "$0")/build.sh"
+ctest --output-on-failure .

scripts/wandbox/JsonGeneratorExample.cpp

@@ -8,11 +8,11 @@
 #include "ArduinoJson.h"
 
 int main() {
-  // The JSON document
+  // Allocate the JSON document
   //
   // Inside the brackets, 200 is the RAM allocated to this document.
   // Don't forget to change this value to match your requirement.
-  // Use arduinojson.org/assistant to compute the capacity.
+  // Use arduinojson.org/v6/assistant to compute the capacity.
   StaticJsonDocument<200> doc;
 
   // StaticJsonObject allocates memory on the stack, it can be
@@ -20,30 +20,35 @@ int main() {
   //
   // DynamicJsonDocument  doc(200);
 
-  // Make our document be an object
-  JsonObject root = doc.to<JsonObject>();
-
-  // Add values in the object
+  // StaticJsonObject allocates memory on the stack, it can be
+  // replaced by DynamicJsonDocument which allocates in the heap.
   //
-  // Most of the time, you can rely on the implicit casts.
-  // In other case, you can do root.set<long>("time", 1351824120);
-  root["sensor"] = "gps";
-  root["time"] = 1351824120;
+  // DynamicJsonDocument  doc(200);
+
+  // Add values in the document
+  //
+  doc["sensor"] = "gps";
+  doc["time"] = 1351824120;
 
   // Add an array.
   //
-  JsonArray data = root.createNestedArray("data");
+  JsonArray data = doc.createNestedArray("data");
   data.add(48.756080);
   data.add(2.302038);
 
-  serializeJson(root, std::cout);
-  // This prints:
+  // Generate the minified JSON and send it to STDOUT
+  //
+  serializeJson(doc, std::cout);
+  // The above line prints:
   // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
 
+  // Start a new line
   std::cout << std::endl;
 
-  serializeJsonPretty(root, std::cout);
-  // This prints:
+  // Generate the prettified JSON and send it to STDOUT
+  //
+  serializeJsonPretty(doc, std::cout);
+  // The above line prints:
   // {
   //   "sensor": "gps",
   //   "time": 1351824120,
@@ -52,6 +57,4 @@ int main() {
   //     2.302038
   //   ]
   // }
-
-  return 0;
 }

scripts/wandbox/JsonParserExample.cpp

@@ -8,23 +8,26 @@
 #include "ArduinoJson.h"
 
 int main() {
-  // Root JSON object
+  // Allocate the JSON document
   //
-  // Inside the brackets, 300 is the size of the memory pool in bytes.
+  // Inside the brackets, 200 is the capacity of the memory pool in bytes.
   // Don't forget to change this value to match your JSON document.
-  // Use arduinojson.org/assistant to compute the capacity.
+  // Use arduinojson.org/v6/assistant to compute the capacity.
   StaticJsonDocument<300> doc;
 
   // StaticJsonDocument<N> allocates memory on the stack, it can be
-  // replaced by DynamicJsonObject which allocates in the heap.
+  // replaced by DynamicJsonDocument which allocates in the heap.
   //
-  // DynamicJsonObject doc(200);
+  // DynamicJsonDocument doc(200);
 
   // JSON input string.
   //
-  // It's better to use a char[] as shown here.
-  // If you use a const char* or a String, ArduinoJson will
-  // have to make a copy of the input in the JsonBuffer.
+  // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
+  // the minimal amount of memory because the JsonDocument stores pointers to
+  // the input buffer.
+  // If you use another type of input, ArduinoJson must copy the strings from
+  // the input to the JsonDocument, so you need to increase the capacity of the
+  // JsonDocument.
   char json[] =
       "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
 
@@ -37,17 +40,14 @@ int main() {
     return 1;
   }
 
-  // Get the root object in the document
-  JsonObject root = doc.as<JsonObject>();
-
   // Fetch values.
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
-  const char* sensor = root["sensor"];
-  long time = root["time"];
-  double latitude = root["data"][0];
-  double longitude = root["data"][1];
+  const char* sensor = doc["sensor"];
+  long time = doc["time"];
+  double latitude = doc["data"][0];
+  double longitude = doc["data"][1];
 
   // Print values.
   std::cout << sensor << std::endl;

scripts/wandbox/MsgPackParserExample.cpp

@@ -49,17 +49,14 @@ int main() {
     return 1;
   }
 
-  // Get the root object in the document
-  JsonObject root = doc.as<JsonObject>();
-
   // Fetch values.
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
-  const char* sensor = root["sensor"];
-  long time = root["time"];
-  double latitude = root["data"][0];
-  double longitude = root["data"][1];
+  const char* sensor = doc["sensor"];
+  long time = doc["time"];
+  double latitude = doc["data"][0];
+  double longitude = doc["data"][1];
 
   // Print values.
   std::cout << sensor << std::endl;

src/ArduinoJson.hpp

@@ -4,6 +4,12 @@
 
 #pragma once
 
+#ifdef __clang__
+#pragma clang system_header
+#elif defined __GNUC__
+#pragma GCC system_header
+#endif
+
 #include "ArduinoJson/Namespace.hpp"
 
 #include "ArduinoJson/Array/ArrayRef.hpp"
@@ -28,6 +34,8 @@
 #include "ArduinoJson/MsgPack/MsgPackDeserializer.hpp"
 #include "ArduinoJson/MsgPack/MsgPackSerializer.hpp"
 
+#include "ArduinoJson/compatibility.hpp"
+
 namespace ArduinoJson {
 typedef ARDUINOJSON_NAMESPACE::ArrayConstRef JsonArrayConst;
 typedef ARDUINOJSON_NAMESPACE::ArrayRef JsonArray;

src/ArduinoJson/Array/ArrayRef.hpp

@@ -23,7 +23,8 @@ template <typename TData>
 class ArrayRefBase {
  public:
   operator VariantConstRef() const {
-    return VariantConstRef(reinterpret_cast<const VariantData*>(_data));
+    const void* data = _data;  // prevent warning cast-align
+    return VariantConstRef(reinterpret_cast<const VariantData*>(data));
   }
 
   template <typename Visitor>
@@ -94,7 +95,8 @@ class ArrayRef : public ArrayRefBase<CollectionData>,
       : base_type(data), _pool(pool) {}
 
   operator VariantRef() {
-    return VariantRef(_pool, reinterpret_cast<VariantData*>(_data));
+    void* data = _data;  // prevent warning cast-align
+    return VariantRef(_pool, reinterpret_cast<VariantData*>(data));
   }
 
   operator ArrayConstRef() const {

src/ArduinoJson/Configuration.hpp

@@ -139,7 +139,7 @@
 #ifndef ARDUINOJSON_LITTLE_ENDIAN
 #if defined(_MSC_VER) ||                                                      \
     (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \
-    (defined(__LITTLE_ENDIAN__))
+    defined(__LITTLE_ENDIAN__) || defined(__i386) || defined(__x86_64)
 #define ARDUINOJSON_LITTLE_ENDIAN 1
 #else
 #define ARDUINOJSON_LITTLE_ENDIAN 0

src/ArduinoJson/Document/StaticJsonDocument.hpp

@@ -8,28 +8,28 @@
 
 namespace ARDUINOJSON_NAMESPACE {
 
-template <size_t CAPACITY>
+template <size_t desiredCapacity>
 class StaticJsonDocument : public JsonDocument {
-  static const size_t ACTUAL_CAPACITY =
-      AddPadding<Max<1, CAPACITY>::value>::value;
+  static const size_t _capacity =
+      AddPadding<Max<1, desiredCapacity>::value>::value;
 
  public:
-  StaticJsonDocument() : JsonDocument(_buffer, ACTUAL_CAPACITY) {}
+  StaticJsonDocument() : JsonDocument(_buffer, _capacity) {}
 
   StaticJsonDocument(const StaticJsonDocument& src)
-      : JsonDocument(_buffer, ACTUAL_CAPACITY) {
+      : JsonDocument(_buffer, _capacity) {
     set(src);
   }
 
   template <typename T>
   StaticJsonDocument(const T& src,
                      typename enable_if<IsVisitable<T>::value>::type* = 0)
-      : JsonDocument(_buffer, ACTUAL_CAPACITY) {
+      : JsonDocument(_buffer, _capacity) {
     set(src);
   }
 
   // disambiguate
-  StaticJsonDocument(VariantRef src) : JsonDocument(_buffer, ACTUAL_CAPACITY) {
+  StaticJsonDocument(VariantRef src) : JsonDocument(_buffer, _capacity) {
     set(src);
   }
 
@@ -45,7 +45,7 @@ class StaticJsonDocument : public JsonDocument {
   }
 
  private:
-  char _buffer[ACTUAL_CAPACITY];
+  char _buffer[_capacity];
 };
 
 }  // namespace ARDUINOJSON_NAMESPACE

src/ArduinoJson/Json/JsonDeserializer.hpp

@@ -306,7 +306,7 @@ class JsonDeserializer {
 
   static inline uint8_t decodeHex(char c) {
     if (c < 'A') return uint8_t(c - '0');
-    c &= ~0x20;  // uppercase
+    c = char(c & ~0x20);  // uppercase
     return uint8_t(c - 'A' + 10);
   }
 

src/ArduinoJson/Memory/MemoryPool.hpp

@@ -91,7 +91,7 @@ class MemoryPool {
     return reinterpret_cast<T*>(allocRight(sizeof(T)));
   }
 
-  char* allocRight(size_t bytes) {
+  void* allocRight(size_t bytes) {
     if (!canAlloc(bytes)) return 0;
     _right -= bytes;
     return _right;

src/ArduinoJson/MsgPack/endianess.hpp

@@ -9,30 +9,33 @@
 
 namespace ARDUINOJSON_NAMESPACE {
 
-inline void fixEndianess(uint8_t* p, integral_constant<size_t, 8>) {
+#if ARDUINOJSON_LITTLE_ENDIAN
+inline void fixEndianess(uint8_t *p, integral_constant<size_t, 8>) {
   swap(p[0], p[7]);
   swap(p[1], p[6]);
   swap(p[2], p[5]);
   swap(p[3], p[4]);
 }
 
-inline void fixEndianess(uint8_t* p, integral_constant<size_t, 4>) {
+inline void fixEndianess(uint8_t *p, integral_constant<size_t, 4>) {
   swap(p[0], p[3]);
   swap(p[1], p[2]);
 }
 
-inline void fixEndianess(uint8_t* p, integral_constant<size_t, 2>) {
+inline void fixEndianess(uint8_t *p, integral_constant<size_t, 2>) {
   swap(p[0], p[1]);
 }
 
-inline void fixEndianess(uint8_t*, integral_constant<size_t, 1>) {}
+inline void fixEndianess(uint8_t *, integral_constant<size_t, 1>) {}
 
 template <typename T>
-inline void fixEndianess(T& value) {
-#if ARDUINOJSON_LITTLE_ENDIAN
-  fixEndianess(reinterpret_cast<uint8_t*>(&value),
+inline void fixEndianess(T &value) {
+  fixEndianess(reinterpret_cast<uint8_t *>(&value),
                integral_constant<size_t, sizeof(T)>());
-#endif
 }
+#else
+template <typename T>
+inline void fixEndianess(T &) {}
+#endif
 
 }  // namespace ARDUINOJSON_NAMESPACE

src/ArduinoJson/Numbers/FloatTraits.hpp

@@ -7,6 +7,7 @@
 #include <stddef.h>  // for size_t
 #include <stdint.h>
 #include "../Configuration.hpp"
+#include "../Polyfills/alias_cast.hpp"
 #include "../Polyfills/math.hpp"
 
 namespace ARDUINOJSON_NAMESPACE {
@@ -98,12 +99,7 @@ struct FloatTraits<T, 8 /*64bits*/> {
   // we use this function to workaround platforms with single precision literals
   // (for example, when -fsingle-precision-constant is passed to GCC)
   static T forge(uint32_t msb, uint32_t lsb) {
-    union {
-      uint64_t integerBits;
-      T floatBits;
-    };
-    integerBits = (uint64_t(msb) << 32) | lsb;
-    return floatBits;
+    return alias_cast<T>((uint64_t(msb) << 32) | lsb);
   }
 };
 
@@ -150,12 +146,7 @@ struct FloatTraits<T, 4 /*32bits*/> {
   }
 
   static T forge(uint32_t bits) {
-    union {
-      uint32_t integerBits;
-      T floatBits;
-    };
-    integerBits = bits;
-    return floatBits;
+    return alias_cast<T>(bits);
   }
 
   static T nan() {

src/ArduinoJson/Object/ObjectRef.hpp

@@ -18,7 +18,8 @@ template <typename TData>
 class ObjectRefBase {
  public:
   operator VariantConstRef() const {
-    return VariantConstRef(reinterpret_cast<const VariantData*>(_data));
+    const void* data = _data;  // prevent warning cast-align
+    return VariantConstRef(reinterpret_cast<const VariantData*>(data));
   }
 
   template <typename Visitor>
@@ -140,7 +141,8 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
       : base_type(data), _pool(buf) {}
 
   operator VariantRef() const {
-    return VariantRef(_pool, reinterpret_cast<VariantData*>(_data));
+    void* data = _data;  // prevent warning cast-align
+    return VariantRef(_pool, reinterpret_cast<VariantData*>(data));
   }
 
   operator ObjectConstRef() const {

src/ArduinoJson/Polyfills/alias_cast.hpp

@@ -0,0 +1,28 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+#pragma once
+
+#include <stdint.h>
+#include <stdlib.h>  // for size_t
+#include "../Configuration.hpp"
+#include "../Polyfills/math.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T, typename F>
+struct alias_cast_t {
+  union {
+    F raw;
+    T data;
+  };
+};
+
+template <typename T, typename F>
+T alias_cast(F raw_data) {
+  alias_cast_t<T, F> ac;
+  ac.raw = raw_data;
+  return ac.data;
+}
+}  // namespace ARDUINOJSON_NAMESPACE

src/ArduinoJson/compatibility.hpp

@@ -0,0 +1,23 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+//
+// clang-format off
+
+#ifdef __GNUC__
+
+#define ARDUINOJSON_PRAGMA(x) _Pragma(#x)
+
+#define ARDUINOJSON_COMPILE_ERROR(msg) ARDUINOJSON_PRAGMA(GCC error msg)
+
+#define ARDUINOJSON_STRINGIFY(S) #S
+
+#define ARDUINOJSON_DEPRECATION_ERROR(X, Y) \
+  ARDUINOJSON_COMPILE_ERROR(ARDUINOJSON_STRINGIFY(X is a Y from ArduinoJson 5. Please see arduinojson.org/upgrade to learn how to upgrade your program to ArduinoJson version 6))
+
+#define StaticJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(StaticJsonBuffer, class)
+#define DynamicJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(DynamicJsonBuffer, class)
+#define JsonBuffer ARDUINOJSON_DEPRECATION_ERROR(JsonBuffer, class)
+#define RawJson ARDUINOJSON_DEPRECATION_ERROR(RawJson, function)
+
+#endif

src/ArduinoJson/version.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#define ARDUINOJSON_VERSION "6.9.0"
+#define ARDUINOJSON_VERSION "6.9.1"
 #define ARDUINOJSON_VERSION_MAJOR 6
 #define ARDUINOJSON_VERSION_MINOR 9
-#define ARDUINOJSON_VERSION_REVISION 0
+#define ARDUINOJSON_VERSION_REVISION 1

test/CMakeLists.txt

@@ -24,7 +24,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 		-Wshadow
 		-Wsign-promo
 		-Wstrict-aliasing
-		-Wstrict-overflow=5
 		-Wundef
 	)
 

test/Misc/CMakeLists.txt

@@ -3,6 +3,7 @@
 # MIT License
 
 add_executable(MiscTests
+	conflicts.cpp
 	FloatParts.cpp
 	StringWriter.cpp
 	TypeTraits.cpp

test/Misc/conflicts.cpp

@@ -0,0 +1,42 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+// All cores
+#define bit()
+#define constrain()
+#define DEFAULT
+#define DISABLED
+#define HIGH
+#define INPUT
+#define LOW
+#define max()
+#define min()
+#define OUTPUT
+#define round()
+#define sq()
+#define word()
+#define bitRead()
+#define bitSet()
+#define bitClear()
+#define bitWrite()
+#define interrupts()
+#define lowByte()
+#define highByte()
+#define DEC
+#define HEX
+#define OCT
+#define BIN
+#define cbi()
+#define sbi()
+
+// ESP8266
+#define _max()
+#define _min()
+
+// issue #839
+#define BLOCKSIZE
+#define CAPACITY
+
+// catch.hpp mutes several warnings, this file also allows to detect them
+#include "ArduinoJson.h"

third-party/catch/CMakeLists.txt

@@ -11,3 +11,8 @@ target_include_directories(catch
 	PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	# prevent "xxx will change in GCC x.x" with arm-linux-gnueabihf-gcc
+	target_compile_options(catch PRIVATE -Wno-psabi)
+endif()