diff options
| author | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
| commit | 1161c5817059464ab511632c0ce5d14593ced1a3 (patch) | |
| tree | 51bbcdf2a4ea43c430312157350bb4271bc3f40d /cpp/src/IcePatch2Lib/ClientUtil.cpp | |
| parent | Update .gitignore files (diff) | |
| download | ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.bz2 ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.xz ice-1161c5817059464ab511632c0ce5d14593ced1a3.zip | |
ICE-4851 - Use wstrings for input and output data that contain non-ASCII characters?
Diffstat (limited to 'cpp/src/IcePatch2Lib/ClientUtil.cpp')
| -rw-r--r-- | cpp/src/IcePatch2Lib/ClientUtil.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp index 2fe5675e4ed..82d0dce208d 100644 --- a/cpp/src/IcePatch2Lib/ClientUtil.cpp +++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp @@ -10,7 +10,7 @@ #include <IceUtil/Unicode.h> #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> -#include <Ice/StringConverter.h> +#include <IceUtil/StringConverter.h> #define ICE_PATCH2_API_EXPORTS #include <IcePatch2/ClientUtil.h> #include <IcePatch2/Util.h> @@ -19,6 +19,7 @@ using namespace std; using namespace Ice; +using namespace IceUtil; using namespace IcePatch2; namespace IcePatch2 @@ -526,7 +527,7 @@ IcePatch2::Patcher::prepare() bool IcePatch2::Patcher::patch(const string& d) { - string dir = simplify(nativeToUTF8(_serverNoCompress->ice_getCommunicator(), d)); + string dir = simplify(d); if(dir.empty() || dir == ".") { @@ -649,11 +650,7 @@ IcePatch2::Patcher::init(const FileServerPrx& server) Ice::CommunicatorPtr communicator = server->ice_getCommunicator(); - // - // Transform dataDir to a UTF8 string (it's either read from the properties or - // provided by the user application directly). - // - const_cast<string&>(_dataDir) = simplify(nativeToUTF8(communicator, _dataDir)); + const_cast<string&>(_dataDir) = simplify(_dataDir); // // Make sure that _chunkSize doesn't exceed MessageSizeMax, otherwise |