summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/jsoncpp/src/test_lib_json/jsontest.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-07-20 08:11:41 +0200
committer ImJezze <jezze@gmx.net>2015-07-20 08:11:41 +0200
commit4bcb0c13f50ddb1cd3fd0341b4bb31d9c3c7fc7a (patch)
tree55eccacfca0e69435d0d4e6615205310ca11f271 /3rdparty/jsoncpp/src/test_lib_json/jsontest.h
parentd132946c6f45aa8d271c6180e86f72dd08243048 (diff)
parent229785f695b26c702c8490792611f59d0366a933 (diff)
Merge pull request #5 from mamedev/master
Sync to base master
Diffstat (limited to '3rdparty/jsoncpp/src/test_lib_json/jsontest.h')
-rw-r--r--3rdparty/jsoncpp/src/test_lib_json/jsontest.h6
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; \