blob: 838ef84879468058f0bad40c3497cb1c969a9ad8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
From 96412d2964775fd6fb9bf359936743dd508af8ba Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Wed, 10 Jun 2015 21:22:24 -0500
Subject: [PATCH] fix #290
(cherry picked from commit 2760c7902a5cc7173aabe4e1f31dcf93e79377d5)
---
src/test_lib_json/main.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index 85110ad..080ba6e 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -296,7 +296,10 @@ JSONTEST_FIXTURE(ValueTest, null) {
JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat());
JSONTEST_ASSERT_STRING_EQUAL("", null_.asString());
+#if !defined(__ARMEL__)
+ // See line #165 of include/json/value.h
JSONTEST_ASSERT_EQUAL(Json::Value::null, null_);
+#endif
}
JSONTEST_FIXTURE(ValueTest, strings) {
|
