Jonathan Gray <[email protected]> writes:
> c++ -o buildscons/linux-gcc-4.2.1/src/test_lib_json/main.o -c -O2 -pipe
> -Iinclude -I. src/test_lib_json/main.cpp
> src/test_lib_json/main.cpp: In member function 'virtual void
> TestValueTestnull::runTestCase()':
> src/test_lib_json/main.cpp:285: error: 'null' is not a member of 'Json::Value'
> scons: *** [buildscons/linux-gcc-4.2.1/src/test_lib_json/main.o] Error 1
> scons: building terminated because of errors.
>
> This is because of include/json/value.h
>
> static const Value& nullRef;
> #if !defined(__ARMEL__)
> /// \deprecated This exists for binary compatibility only. Use nullRef.
> static const Value null;
> #endif
>
> cc -E -dM - </dev/null | fgrep ARM
> #define __ARMEL__ 1
> #define __ARM_ARCH_4__ 1
>
> no bump as this is just a test.
ok jca@
> Index: patches/patch-src_test_lib_json_main_cpp
> ===================================================================
> RCS file: /cvs/ports/devel/jsoncpp/patches/patch-src_test_lib_json_main_cpp,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_test_lib_json_main_cpp
> --- patches/patch-src_test_lib_json_main_cpp 29 Mar 2015 10:48:21 -0000
> 1.1
> +++ patches/patch-src_test_lib_json_main_cpp 4 Jun 2015 03:56:57 -0000
> @@ -1,6 +1,15 @@
> $OpenBSD: patch-src_test_lib_json_main_cpp,v 1.1 2015/03/29 10:48:21 sthen
> Exp $
> ---- src/test_lib_json/main.cpp.orig Sun Mar 29 11:47:25 2015
> -+++ src/test_lib_json/main.cpp Sun Mar 29 11:47:39 2015
> +--- src/test_lib_json/main.cpp.orig Sun Apr 12 05:49:59 2015
> ++++ src/test_lib_json/main.cpp Thu Jun 4 13:48:06 2015
> +@@ -282,7 +282,7 @@ JSONTEST_FIXTURE(ValueTest, null) {
> + JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat());
> + JSONTEST_ASSERT_STRING_EQUAL("", null_.asString());
> +
> +- JSONTEST_ASSERT_EQUAL(Json::Value::null, null_);
> ++ JSONTEST_ASSERT_EQUAL(Json::Value::nullRef, null_);
> + }
> +
> + JSONTEST_FIXTURE(ValueTest, strings) {
> @@ -1240,7 +1240,7 @@ JSONTEST_FIXTURE(ValueTest, nonIntegers) {
>
> // A 16-digit floating point number.
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
