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/Freeze/ObjectStore.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/Freeze/ObjectStore.cpp')
| -rw-r--r-- | cpp/src/Freeze/ObjectStore.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp index 87aebc64f16..90756adba5e 100644 --- a/cpp/src/Freeze/ObjectStore.cpp +++ b/cpp/src/Freeze/ObjectStore.cpp @@ -15,7 +15,7 @@ #include <Freeze/TransactionI.h> #include <Freeze/IndexI.h> -#include <Ice/StringConverter.h> +#include <IceUtil/StringConverter.h> using namespace std; using namespace Ice; @@ -132,13 +132,15 @@ Freeze::ObjectStoreBase::ObjectStoreBase(const string& facet, const string& face } // - // We keep _dbName as a native string here, while it might have + // Berkeley DB expects file paths to be UTF8 encoded. We keep + // _dbName as a native string here, while it might have // been better to convert it to UTF-8, changing this isn't // possible without potentially breaking backward compatibility // with deployed databases. // - _db->open(txn, Ice::nativeToUTF8(evictor->communicator(), evictor->filename()).c_str(), _dbName.c_str(), - DB_BTREE, flags, FREEZE_DB_MODE); + _db->open(txn, + IceUtil::nativeToUTF8(IceUtil::getProcessStringConverter(), evictor->filename()).c_str(), + _dbName.c_str(), DB_BTREE, flags, FREEZE_DB_MODE); for(size_t i = 0; i < _indices.size(); ++i) { |