diff options
author | Bernard Normier <bernard@zeroc.com> | 2007-07-18 12:13:02 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2007-07-18 12:13:02 -0400 |
commit | 2d83ccfda0cb62f494e0ae93989c661df17392b3 (patch) | |
tree | ab3fc4962d4e6169aaeec586d24892be173bbc53 /cpp/test/Ice/stringConverter/Client.cpp | |
parent | beautification (diff) | |
parent | adding demo/book/freeze_filesystem/README (diff) | |
download | ice-2d83ccfda0cb62f494e0ae93989c661df17392b3.tar.bz2 ice-2d83ccfda0cb62f494e0ae93989c661df17392b3.tar.xz ice-2d83ccfda0cb62f494e0ae93989c661df17392b3.zip |
Merge branch 'master' of ssh://cvs/home/git/ice
Diffstat (limited to 'cpp/test/Ice/stringConverter/Client.cpp')
-rw-r--r-- | cpp/test/Ice/stringConverter/Client.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp index 02ebd4af577..795535d6ece 100644 --- a/cpp/test/Ice/stringConverter/Client.cpp +++ b/cpp/test/Ice/stringConverter/Client.cpp @@ -82,7 +82,9 @@ main(int argc, char* argv[]) if(useLocale) { +#ifndef _WIN32 initData.stringConverter = new Ice::IconvStringConverter<char>; +#endif } else { |