From 609ea9cf02f31b653b3a3455ed950ef01dbfc32c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 10 Feb 2008 17:18:04 +0000 Subject: [PATCH] fix compilation with VC7 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/xlocale/xlocale.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/xlocale/xlocale.cpp b/tests/xlocale/xlocale.cpp index 9a6ba3aa36..157afad2b3 100644 --- a/tests/xlocale/xlocale.cpp +++ b/tests/xlocale/xlocale.cpp @@ -148,20 +148,20 @@ void XLocaleTestCase::TestCtypeFunctionsWith(const wxXLocale& loc) CPPUNIT_ASSERT( !wxIsxdigit_l('z', loc) ); // tolower - CPPUNIT_ASSERT_EQUAL( 'a', wxTolower_l('A', loc) ); - CPPUNIT_ASSERT_EQUAL( 'a', wxTolower_l('a', loc) ); - CPPUNIT_ASSERT_EQUAL( 'z', wxTolower_l('Z', loc) ); - CPPUNIT_ASSERT_EQUAL( 'z', wxTolower_l('z', loc) ); - CPPUNIT_ASSERT_EQUAL( '0', wxTolower_l('0', loc) ); - CPPUNIT_ASSERT_EQUAL( '9', wxTolower_l('9', loc) ); + CPPUNIT_ASSERT_EQUAL( 'a', (char)wxTolower_l('A', loc) ); + CPPUNIT_ASSERT_EQUAL( 'a', (char)wxTolower_l('a', loc) ); + CPPUNIT_ASSERT_EQUAL( 'z', (char)wxTolower_l('Z', loc) ); + CPPUNIT_ASSERT_EQUAL( 'z', (char)wxTolower_l('z', loc) ); + CPPUNIT_ASSERT_EQUAL( '0', (char)wxTolower_l('0', loc) ); + CPPUNIT_ASSERT_EQUAL( '9', (char)wxTolower_l('9', loc) ); // toupper - CPPUNIT_ASSERT_EQUAL( 'A', wxToupper_l('A', loc) ); - CPPUNIT_ASSERT_EQUAL( 'A', wxToupper_l('a', loc) ); - CPPUNIT_ASSERT_EQUAL( 'Z', wxToupper_l('Z', loc) ); - CPPUNIT_ASSERT_EQUAL( 'Z', wxToupper_l('z', loc) ); - CPPUNIT_ASSERT_EQUAL( '0', wxToupper_l('0', loc) ); - CPPUNIT_ASSERT_EQUAL( '9', wxToupper_l('9', loc) ); + CPPUNIT_ASSERT_EQUAL( 'A', (char)wxToupper_l('A', loc) ); + CPPUNIT_ASSERT_EQUAL( 'A', (char)wxToupper_l('a', loc) ); + CPPUNIT_ASSERT_EQUAL( 'Z', (char)wxToupper_l('Z', loc) ); + CPPUNIT_ASSERT_EQUAL( 'Z', (char)wxToupper_l('z', loc) ); + CPPUNIT_ASSERT_EQUAL( '0', (char)wxToupper_l('0', loc) ); + CPPUNIT_ASSERT_EQUAL( '9', (char)wxToupper_l('9', loc) ); } void XLocaleTestCase::TestCtypeFunctions()