From f4db86cc7734079b23aacdaff9c9a63320424be8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 30 Nov 2020 17:10:05 +0100 Subject: [PATCH] Fix signed/unsigned comparison warnings in wxVsnprintf test These warnings only appeared in build configurations using our own implementation, i.e. not in the default build. --- tests/strings/vsnprintf.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp index 905416a2d1..50dd2cc3a5 100644 --- a/tests/strings/vsnprintf.cpp +++ b/tests/strings/vsnprintf.cpp @@ -50,27 +50,27 @@ int r; #define CMP6(expected, fmt, y, z, w, t) \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w, t); \ - CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ + CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \ ASSERT_STR_EQUAL( wxT(expected), buf ); #define CMP5(expected, fmt, y, z, w) \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z, w); \ - CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ + CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \ ASSERT_STR_EQUAL( wxT(expected), buf ); #define CMP4(expected, fmt, y, z) \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y, z); \ - CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ + CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \ ASSERT_STR_EQUAL( wxT(expected), buf ); #define CMP3(expected, fmt, y) \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y); \ - CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ + CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \ ASSERT_STR_EQUAL( wxT(expected), buf ); #define CMP2(expected, fmt) \ r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt)); \ - CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) ); \ + CPPUNIT_ASSERT_EQUAL( r, (int)wxStrlen(buf) ); \ ASSERT_STR_EQUAL( wxT(expected), buf ); // NOTE: this macro is used also with too-small buffers (see Miscellaneous()) @@ -354,7 +354,7 @@ void VsnprintfTestCase::S() #define CMP3_UTF8(expected, fmt, arg) \ CPPUNIT_ASSERT_EQUAL \ ( \ - wxString::FromUTF8(expected).length(), \ + (int)wxString::FromUTF8(expected).length(), \ wxSnprintf(buf, MAX_TEST_LEN, fmt, wxString::FromUTF8(arg)) \ ); \ CPPUNIT_ASSERT_EQUAL \