Fixed issue #998

Author: bblanchon

src/ArduinoJson/Operators/VariantComparisons.hpp

@@ -13,10 +13,10 @@ struct Comparer;
 
 template <typename T>
 struct Comparer<T, typename enable_if<IsString<T>::value>::type> {
-  bool result;
   T comparand;
+  bool result;
 
-  explicit Comparer(T value) : comparand(value) {}
+  explicit Comparer(T value) : comparand(value), result(false) {}
 
   void visitArray(const CollectionData &) {}
   void visitObject(const CollectionData &) {}
@@ -28,15 +28,17 @@ struct Comparer<T, typename enable_if<IsString<T>::value>::type> {
   void visitNegativeInteger(UInt) {}
   void visitPositiveInteger(UInt) {}
   void visitBoolean(bool) {}
-  void visitNull() {}
+  void visitNull() {
+    result = adaptString(comparand).isNull();
+  }
 };
 
 template <typename T>
 struct ArithmeticComparer {
-  bool result;
   T comparand;
+  bool result;
 
-  explicit ArithmeticComparer(T value) : comparand(value) {}
+  explicit ArithmeticComparer(T value) : comparand(value), result(false) {}
 
   void visitArray(const CollectionData &) {}
   void visitObject(const CollectionData &) {}
@@ -114,7 +116,9 @@ class VariantComparisons {
   template <typename T>
   friend typename enable_if<is_simple_value<T>::value, bool>::type operator==(
       TVariant lhs, const T &rhs) {
-    return lhs.template as<T>() == rhs;
+    ArithmeticComparer<T> comparer(rhs);
+    lhs.accept(comparer);
+    return comparer.result;
   }
 
   // const char* != TVariant
@@ -149,14 +153,14 @@ class VariantComparisons {
   template <typename T>
   friend typename enable_if<is_simple_value<T>::value, bool>::type operator!=(
       const T &lhs, TVariant rhs) {
-    return lhs != rhs.template as<T>();
+    return !operator==(lhs, rhs);
   }
 
   // TVariant != bool/int/float
   template <typename T>
   friend typename enable_if<is_simple_value<T>::value, bool>::type operator!=(
       TVariant lhs, const T &rhs) {
-    return lhs.template as<T>() != rhs;
+    return !operator==(lhs, rhs);
   }
 
   // bool/int/float < TVariant

test/JsonVariant/createNested.cpp

@@ -14,7 +14,7 @@ TEST_CASE("JsonVariant::createNestedObject()") {
 
   SECTION("promotes to array") {
     JsonObject obj = variant.createNestedObject();
-    obj["value"] = "42";
+    obj["value"] = 42;
 
     REQUIRE(variant.is<JsonArray>() == true);
     REQUIRE(variant[0]["value"] == 42);
@@ -23,7 +23,7 @@ TEST_CASE("JsonVariant::createNestedObject()") {
 
   SECTION("works on MemberProxy") {
     JsonObject obj = variant["items"].createNestedObject();
-    obj["value"] = "42";
+    obj["value"] = 42;
 
     REQUIRE(variant["items"][0]["value"] == 42);
   }
@@ -42,7 +42,7 @@ TEST_CASE("JsonVariant::createNestedArray()") {
 
   SECTION("works on MemberProxy") {
     JsonArray arr = variant["items"].createNestedArray();
-    arr.add("42");
+    arr.add(42);
 
     REQUIRE(variant["items"][0][0] == 42);
   }
@@ -54,15 +54,15 @@ TEST_CASE("JsonVariant::createNestedObject(key)") {
 
   SECTION("promotes to object") {
     JsonObject obj = variant.createNestedObject("weather");
-    obj["temp"] = "42";
+    obj["temp"] = 42;
 
     REQUIRE(variant.is<JsonObject>() == true);
     REQUIRE(variant["weather"]["temp"] == 42);
   }
 
   SECTION("works on MemberProxy") {
     JsonObject obj = variant["status"].createNestedObject("weather");
-    obj["temp"] = "42";
+    obj["temp"] = 42;
 
     REQUIRE(variant["status"]["weather"]["temp"] == 42);
   }
@@ -81,7 +81,7 @@ TEST_CASE("JsonVariant::createNestedArray(key)") {
 
   SECTION("works on MemberProxy") {
     JsonArray arr = variant["weather"].createNestedArray("temp");
-    arr.add("42");
+    arr.add(42);
 
     REQUIRE(variant["weather"]["temp"][0] == 42);
   }