From 0eb13ae23f4d69a73651a762d146c7d7408fbecc Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Wed, 18 Jul 2007 11:27:58 -0400
Subject: Added default ctor

---
 cpp/test/Ice/stringConverter/Client.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'cpp/test/Ice/stringConverter/Client.cpp')

diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index f7355aef4c1..67767701e80 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -12,6 +12,7 @@
 #include <Test.h>
 #include <Ice/IconvStringConverter.h>
 #include <iostream>
+#include <locale.h>
 
 using namespace std;
 
@@ -51,14 +52,27 @@ int
 main(int argc, char* argv[])
 {
     Client app;
-    
+
+    //
+    // Switch to French locale
+    // (we just used the codeset for as default internal code for 
+    // initData.stringConverter below)
+    //
+    setlocale(LC_ALL, "fr_FR.ISO8859-15");
+      
     Ice::InitializationData initData;
 
 #if defined(__hpux)
     initData.stringConverter = new Ice::IconvStringConverter<char>("iso815");
     initData.wstringConverter = new Ice::IconvStringConverter<wchar_t>("ucs4");  
-#else   
-    initData.stringConverter = new Ice::IconvStringConverter<char>("ISO-8859-15");
+#else
+
+#ifdef _WIN32
+    initData.stringConverter = new Ice::IconvStringConverter<char>("ISO8859-15");
+#else      
+    initData.stringConverter = new Ice::IconvStringConverter<char>;
+#endif
+
     if(sizeof(wchar_t) == 4)
     {
 #ifdef ICE_BIG_ENDIAN
-- 
cgit v1.2.3