Skip to content

Commit f871585

Browse files
committed
Fix gcc -Wall warnings (patch from Matt McCormick)
1 parent 42321f2 commit f871585

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/test_lib_json/jsontest.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ namespace JsonTest {
190190
checkEqual( TestResult &result, const T &expected, const U &actual,
191191
const char *file, unsigned int line, const char *expr )
192192
{
193-
if ( expected != actual )
193+
if ( static_cast< U >( expected ) != actual )
194194
{
195195
result.addFailure( file, line, expr );
196196
result << "Expected: " << expected << "\n";
@@ -229,8 +229,7 @@ namespace JsonTest {
229229
result_->predicateStackTail_ = &_minitest_Context; \
230230
(expr); \
231231
result_->popPredicateContext(); \
232-
} \
233-
*result_
232+
}
234233

235234
/// \brief Asserts that two values are equals.
236235
#define JSONTEST_ASSERT_EQUAL( expected, actual ) \

src/test_lib_json/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ struct ValueTest : JsonTest::TestCase
6363
: emptyArray_( Json::arrayValue )
6464
, emptyObject_( Json::objectValue )
6565
, integer_( 123456789 )
66-
, smallUnsignedInteger_( Json::Value::UInt( Json::Value::maxInt ) )
6766
, unsignedInteger_( 34567890u )
67+
, smallUnsignedInteger_( Json::Value::UInt( Json::Value::maxInt ) )
6868
, real_( 1234.56789 )
6969
, float_( 0.00390625f )
7070
, emptyString_( "" )

0 commit comments

Comments
 (0)