diff options
author | 2015-07-02 16:53:38 -0500 | |
---|---|---|
committer | 2015-07-08 14:31:26 -0500 | |
commit | 21b5ebeba7dc4ef9d8b1f809741ad73418989a16 (patch) | |
tree | d163ac2b76b5362c8da954ee8221922c6eb126dc /3rdparty/jsoncpp/src/test_lib_json/jsontest.h | |
parent | 1e37ed88936371ede63ada5b7aea9dd1d0bc287c (diff) |
github version of jsoncpp with some fixes: pedantic and C++98 and others. please try to compile for all platforms
Diffstat (limited to '3rdparty/jsoncpp/src/test_lib_json/jsontest.h')
-rw-r--r-- | 3rdparty/jsoncpp/src/test_lib_json/jsontest.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 <typename T, typename U> 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; \ |