fix a couple of harmless warnings in MSVC build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -282,6 +282,12 @@ void FormatConverterTestCase::check(const wxString& input,
|
|||||||
const wxString& expectedWcharUnix,
|
const wxString& expectedWcharUnix,
|
||||||
const wxString& expectedWcharWindows)
|
const wxString& expectedWcharWindows)
|
||||||
{
|
{
|
||||||
|
// all of them are unused in some build configurations
|
||||||
|
wxUnusedVar(expectedScanf);
|
||||||
|
wxUnusedVar(expectedUtf8);
|
||||||
|
wxUnusedVar(expectedWcharUnix);
|
||||||
|
wxUnusedVar(expectedWcharWindows);
|
||||||
|
|
||||||
wxString result, msg;
|
wxString result, msg;
|
||||||
|
|
||||||
#ifndef __WINDOWS__
|
#ifndef __WINDOWS__
|
||||||
|
@@ -114,7 +114,13 @@ void VarArgTestCase::CharPrintf()
|
|||||||
WX_ASSERT_STR_EQUAL( "a to z", s );
|
WX_ASSERT_STR_EQUAL( "a to z", s );
|
||||||
|
|
||||||
// test char used as integer:
|
// test char used as integer:
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(disable:4309) // truncation of constant value
|
||||||
|
#endif
|
||||||
c = 240;
|
c = 240;
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(default:4309)
|
||||||
|
#endif
|
||||||
s.Printf("value is %i (int)", c);
|
s.Printf("value is %i (int)", c);
|
||||||
WX_ASSERT_STR_EQUAL( wxString("value is -16 (int)"), s );
|
WX_ASSERT_STR_EQUAL( wxString("value is -16 (int)"), s );
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user