From 6ed28b941c9a7f6e6a019c9d61dc947d0c8f6e5a Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Wed, 20 Feb 2008 22:28:02 +0000 Subject: [PATCH] Compile fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/strings/iostream.cpp | 2 ++ tests/strings/vsnprintf.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/strings/iostream.cpp b/tests/strings/iostream.cpp index 6e40cbb..0abf396 100644 --- 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); +#ifndef __MINGW32__ 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 bef2356..61b9aba 100644 --- 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); - CMP3("123456789abcdef", "%I64x", (wxLongLong_t)0x123456789abcdef); + CMP3("123456789abcdef", "%I64x", wxLL(0x123456789abcdef)); #endif } #endif -- 2.7.4