From 15e2adbd3b3f0904851f73995fc9bf3c83d122d3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Oct 2004 20:17:00 +0000
Subject: [PATCH] compilation fix for Borland

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 tests/strings/strings.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 2cf63e644f..1aa6be1ba8 100644
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -155,12 +155,14 @@ void StringTestCase::Constructors()
 #if wxUSE_WCHAR_T
 void StringTestCase::ConstructorsWithConversion()
 {
-    // Déj`a in UTF-8 and wchar_t:
-    const unsigned char utf8[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0};
+    // the string "Déjà" in UTF-8 and wchar_t:
+    const unsigned char utf8Buf[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0};
     const wchar_t wchar[] = {0x44,0xE9,0x6A,0xE0,0};
-    const unsigned char utf8sub[] = {0x44,0xC3,0xA9,0x6A,0}; // "Dej"
+    const unsigned char utf8subBuf[] = {0x44,0xC3,0xA9,0x6A,0}; // just "Déj"
+    const char *utf8 = (char *)utf8Buf;
+    const char *utf8sub = (char *)utf8subBuf;
 
-    wxString s1((char *)utf8, wxConvUTF8);
+    wxString s1(utf8, wxConvUTF8);
     wxString s2(wchar, wxConvUTF8);
 
 #if wxUSE_UNICODE
@@ -171,8 +173,8 @@ void StringTestCase::ConstructorsWithConversion()
     CPPUNIT_ASSERT( s2 == utf8 );
 #endif
 
-    wxString sub((char *)utf8sub, wxConvUTF8); // "Dej" substring
-    wxString s3((char *)utf8, wxConvUTF8, 4);
+    wxString sub(utf8sub, wxConvUTF8); // "Dej" substring
+    wxString s3(utf8, wxConvUTF8, 4);
     wxString s4(wchar, wxConvUTF8, 3);
 
     CPPUNIT_ASSERT( s3 == sub );
-- 
2.45.2