Compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/strings/iostream.cpp b/tests/strings/iostream.cpp
index 6e40cbb28f124b1f3c8eb16b56eafb09828fc90b..0abf39621151c937c51a2d69de7528cedd2d93b4 100644 (file)
--- a/tests/strings/iostream.cpp
+++ b/tests/strings/iostream.cpp
@@ -54,8 +54,10 @@ void StringIostreamTestCase::Out()
     s << wxString("hello");
     ASSERT_OSTREAM_EQUAL("hello", s);
 
     s << wxString("hello");
     ASSERT_OSTREAM_EQUAL("hello", s);
 

+#ifndef __MINGW32__

     std::wostringstream ws;
     ws << wxString("bye");
     ASSERT_WOSTREAM_EQUAL(L"bye", ws);
     std::wostringstream ws;
     ws << wxString("bye");
     ASSERT_WOSTREAM_EQUAL(L"bye", ws);

+#endif

 }
 
 }
 

diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp
index bef23562143f4bd0ee0448da01025e2f5acf1804..61b9abae3f00f5ca234038e614cabfad2952161f 100644 (file)
--- a/tests/strings/vsnprintf.cpp
+++ b/tests/strings/vsnprintf.cpp
@@ -376,7 +376,7 @@ void VsnprintfTestCase::LongLong()
 
 #ifdef __WXMSW__
     CMP3("123456789", "%I64d", (wxLongLong_t)123456789);
 
 #ifdef __WXMSW__
     CMP3("123456789", "%I64d", (wxLongLong_t)123456789);

-    CMP3("123456789abcdef", "%I64x", (wxLongLong_t)0x123456789abcdef);
+    CMP3("123456789abcdef", "%I64x", wxLL(0x123456789abcdef));

 #endif
 }
 #endif
 #endif
 }
 #endif