Fixed variant.is<nullptr_t>()

bblanchon · Jan 13, 2020 · 97e6d20 · 97e6d20
1 parent f9cfea2
commit 97e6d20
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ HEAD
   (No need to define `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_STD_STREAM` anymore)
 * Improved decoding of UTF-16 surrogate pairs (PR #1157 by @kaysievers)
   (ArduinoJson now produces standard UTF-8 instead of CESU-8)
+* Fixed `variant.is<nullptr_t>()`
 
 
 v6.13.0 (2019-11-01)

diff --git a/extras/tests/MixedConfiguration/cpp11.cpp b/extras/tests/MixedConfiguration/cpp11.cpp
@@ -26,6 +26,14 @@ TEST_CASE("nullptr") {
 
     REQUIRE(variant.isNull());
   }
+
+  SECTION("JsonVariant.is<nullptr_t>()") {
+    variant.set(42);
+    REQUIRE(variant.is<nullptr_t>() == false);
+
+    variant.clear();
+    REQUIRE(variant.is<nullptr_t>() == true);
+  }
 }
 
 TEST_CASE("Issue #1120") {

diff --git a/src/ArduinoJson/Variant/VariantRef.hpp b/src/ArduinoJson/Variant/VariantRef.hpp
@@ -91,6 +91,15 @@ class VariantRefBase {
   is() const {
     return variantIsObject(_data);
   }
+#if ARDUINOJSON_HAS_NULLPTR
+  //
+  // bool is<nullptr_t> const;
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, nullptr_t>::value, bool>::type is()
+      const {
+    return variantIsNull(_data);
+  }
+#endif
 
   FORCE_INLINE bool isNull() const {
     return variantIsNull(_data);