From 166f754973998fdf1689cadaf5e9209268723d24 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Nov 2017 01:25:39 +0100 Subject: [PATCH] Fix comparison of size_t values with -1 in base 64 unit test This doesn't work correctly in Catch after reverting the commit that broke compilation with MSVC 9, so we have to live with explicitly using the values of the correct type. --- tests/base64/base64.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/base64/base64.cpp b/tests/base64/base64.cpp index d75be1108a..9405406887 100644 --- a/tests/base64/base64.cpp +++ b/tests/base64/base64.cpp @@ -291,16 +291,17 @@ void Base64TestCase::DecodeInvalid() CPPUNIT_ASSERT_EQUAL( wxCONV_FAILED, rc); CPPUNIT_ASSERT_EQUAL( 0, posErr ); - posErr = (size_t)-1; + const size_t POS_INVALID = -1; + posErr = POS_INVALID; rc = wxBase64Decode(NULL, 0, " QQ==", wxNO_LEN, wxBase64DecodeMode_SkipWS, &posErr); CPPUNIT_ASSERT_EQUAL( 1, rc ); - CPPUNIT_ASSERT_EQUAL( -1, posErr ); + CPPUNIT_ASSERT_EQUAL( POS_INVALID, posErr ); rc = wxBase64Decode(NULL, 0, "? QQ==", wxNO_LEN, wxBase64DecodeMode_Relaxed, &posErr); CPPUNIT_ASSERT_EQUAL( 1, rc ); - CPPUNIT_ASSERT_EQUAL( -1, posErr ); + CPPUNIT_ASSERT_EQUAL( POS_INVALID, posErr ); CPPUNIT_ASSERT( !wxBase64Decode("wxGetApp()").GetDataLen() ); }