Merge pull request #295 from miloyip/issue287_WarningFloatEqual

Fix several -Wfloat-equal related comments in #293

include/rapidjson/document.h

@@ -701,8 +701,9 @@ public:
 
         case kNumberType:
             if (IsDouble() || rhs.IsDouble()) {
-                float delta = GetDouble() - rhs.GetDouble();    // May convert one operand from integer to double.
-                return delta >= 0.0 && delta <= 0.0;            // Prevent -Wfloat-equal
+                double a = GetDouble();     // May convert from integer to double.
+                double b = rhs.GetDouble(); // Ditto
+                return a >= b && a <= b;    // Prevent -Wfloat-equal
             }
             else
                 return data_.n.u64 == rhs.data_.n.u64;

test/unittest/readertest.cpp

@@ -189,14 +189,15 @@ static void TestParseDouble() {
         ASSERT_EQ(kParseErrorNone, reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h).Code()); \
         EXPECT_EQ(1u, h.step_); \
         internal::Double e(x), a(h.actual_); \
-        EXPECT_EQ(e.Sign(), a.Sign()); \
         if (fullPrecision) { \
-            EXPECT_NEAR(x, h.actual_, 0.0); \
-            if (x != h.actual_) \
-            printf("  String: %s\n  Actual: %.17g\nExpected: %.17g\n", str, h.actual_, x); \
+            EXPECT_EQ(e.Uint64Value(), a.Uint64Value()); \
+            if (e.Uint64Value() != a.Uint64Value()) \
+                printf("  String: %s\n  Actual: %.17g\nExpected: %.17g\n", str, h.actual_, x); \
         } \
-        else \
+        else { \
+            EXPECT_EQ(e.Sign(), a.Sign()); /* for 0.0 != -0.0 */ \
             EXPECT_DOUBLE_EQ(x, h.actual_); \
+        } \
     }
     
     TEST_DOUBLE(fullPrecision, "0.0", 0.0);