]> git.saurik.com Git - wxWidgets.git/commitdiff
fix a couple of harmless warnings in MSVC build
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 14 Sep 2007 23:33:46 +0000 (23:33 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 14 Sep 2007 23:33:46 +0000 (23:33 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

tests/formatconverter/formatconvertertest.cpp
tests/strings/vararg.cpp

index ec629c59ef519ef6a68b9de66eb8b21020ac17de..1e5d50a3b1b4643b555f8f31d1f5fef35ee3e55c 100644 (file)
@@ -282,6 +282,12 @@ void FormatConverterTestCase::check(const wxString& input,
                                     const wxString& expectedWcharUnix,
                                     const wxString& expectedWcharWindows)
 {
+    // all of them are unused in some build configurations
+    wxUnusedVar(expectedScanf);
+    wxUnusedVar(expectedUtf8);
+    wxUnusedVar(expectedWcharUnix);
+    wxUnusedVar(expectedWcharWindows);
+
     wxString result, msg;
 
 #ifndef __WINDOWS__
index 556dd74ca2770f9cf66f97afa6a870288facf9de..5aca188c423761b06f0f82a0840a12924035142d 100644 (file)
@@ -114,7 +114,13 @@ void VarArgTestCase::CharPrintf()
     WX_ASSERT_STR_EQUAL( "a to z", s );
 
     // test char used as integer:
+    #ifdef _MSC_VER
+        #pragma warning(disable:4309) // truncation of constant value
+    #endif
     c = 240;
+    #ifdef _MSC_VER
+        #pragma warning(default:4309)
+    #endif
     s.Printf("value is %i (int)", c);
     WX_ASSERT_STR_EQUAL( wxString("value is -16 (int)"), s );