X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0646b21922772e5dec7f8f31c1a22d2d0dec6ec7..61b6c82294f4af6c5d53fb65b21e92f4fe83887a:/tests/streams/textstreamtest.cpp

diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp
index 13c9804334..16cbcdee94 100644
--- a/tests/streams/textstreamtest.cpp
+++ b/tests/streams/textstreamtest.cpp
@@ -185,7 +185,7 @@ void TextStreamTestCase::TestULongLong()
 
 #if wxUSE_UNICODE
 
-const static wchar_t txtWchar[4] =
+static const wchar_t txtWchar[4] =
 {
     0x0041, // LATIN CAPITAL LETTER A
     0x0100, // A WITH BREVE, LATIN SMALL LETTER
@@ -193,28 +193,28 @@ const static wchar_t txtWchar[4] =
     0x0100, // A WITH BREVE, LATIN SMALL LETTER
 };
 
-const static unsigned char txtUtf8[6] =
+static const unsigned char txtUtf8[6] =
 {
     0x41, 0xc4, 0x80, 0x41, 0xc4, 0x80,
 };
 
-const static unsigned char txtUtf16le[8] =
+static const unsigned char txtUtf16le[8] =
 {
     0x41, 0x00, 0x00, 0x01, 0x41, 0x00, 0x00, 0x01,
 };
 
-const static unsigned char txtUtf16be[8] =
+static const unsigned char txtUtf16be[8] =
 {
     0x00, 0x41, 0x01, 0x00, 0x00, 0x41, 0x01, 0x00,
 };
 
-const static unsigned char txtUtf32le[16] =
+static const unsigned char txtUtf32le[16] =
 {
     0x41, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
     0x41, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
 };
 
-const static unsigned char txtUtf32be[16] =
+static const unsigned char txtUtf32be[16] =
 {
     0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x01, 0x00,
     0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x01, 0x00,
@@ -265,7 +265,7 @@ void TextStreamTestCase::TestInput(const wxMBConv& conv,
 
     CPPUNIT_ASSERT_EQUAL( WXSIZEOF(txtWchar), temp.length() );
 
-    CPPUNIT_ASSERT_EQUAL( 0, memcmp(txtWchar, temp.c_str(), sizeof(txtWchar)) );
+    CPPUNIT_ASSERT_EQUAL( 0, memcmp(txtWchar, temp.wc_str(), sizeof(txtWchar)) );
 }
 
 #endif // wxUSE_UNICODE