From 21b5ebeba7dc4ef9d8b1f809741ad73418989a16 Mon Sep 17 00:00:00 2001 From: Cowering Date: Thu, 2 Jul 2015 16:53:38 -0500 Subject: github version of jsoncpp with some fixes: pedantic and C++98 and others. please try to compile for all platforms --- 3rdparty/jsoncpp/src/test_lib_json/jsontest.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '3rdparty/jsoncpp/src/test_lib_json/jsontest.h') diff --git a/3rdparty/jsoncpp/src/test_lib_json/jsontest.h b/3rdparty/jsoncpp/src/test_lib_json/jsontest.h index 5c56a40b0ff..d6b7cf386a2 100644 --- a/3rdparty/jsoncpp/src/test_lib_json/jsontest.h +++ b/3rdparty/jsoncpp/src/test_lib_json/jsontest.h @@ -178,8 +178,8 @@ private: template TestResult& checkEqual(TestResult& result, - const T& expected, - const U& actual, + T expected, + U actual, const char* file, unsigned int line, const char* expr) { @@ -214,7 +214,7 @@ TestResult& checkStringEqual(TestResult& result, #define JSONTEST_ASSERT_PRED(expr) \ { \ JsonTest::PredicateContext _minitest_Context = { \ - result_->predicateId_, __FILE__, __LINE__, #expr \ + result_->predicateId_, __FILE__, __LINE__, #expr, NULL, NULL \ }; \ result_->predicateStackTail_->next_ = &_minitest_Context; \ result_->predicateId_ += 1; \ -- cgit v1.2.3-70-g09d2