diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-05-16 12:30:43 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-05-16 12:30:43 -0400 |
| commit | 3f3450439b7558443a58279980aadaf069f5a086 (patch) | |
| tree | e3d5a066653b410e668b0f71f5cfde42e07177c4 /cpp/src/Freeze/MapI.cpp | |
| parent | Fixed build (diff) | |
| download | ice-3f3450439b7558443a58279980aadaf069f5a086.tar.bz2 ice-3f3450439b7558443a58279980aadaf069f5a086.tar.xz ice-3f3450439b7558443a58279980aadaf069f5a086.zip | |
Updated nativeToUTF8 and UTF8ToNative for consistency with stringToWstring/wstringToString
Diffstat (limited to 'cpp/src/Freeze/MapI.cpp')
| -rw-r--r-- | cpp/src/Freeze/MapI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp index 15e24028837..effaa167982 100644 --- a/cpp/src/Freeze/MapI.cpp +++ b/cpp/src/Freeze/MapI.cpp @@ -205,7 +205,7 @@ Freeze::MapHelper::recreate(const Freeze::ConnectionPtr& connection, // Berkeley DB expects file paths to be UTF8 encoded. // oldDb.open(txn, - IceUtil::nativeToUTF8(IceUtil::getProcessStringConverter(), oldDbName).c_str(), + IceUtil::nativeToUTF8(oldDbName, IceUtil::getProcessStringConverter()).c_str(), 0, DB_BTREE, DB_THREAD, FREEZE_DB_MODE); IceUtil::UniquePtr<MapDb> newDb(new MapDb(connectionI, dbName, key, value, keyCompare, indices, true)); @@ -1780,7 +1780,7 @@ Freeze::MapIndexI::MapIndexI(const ConnectionIPtr& connection, MapDb& db, // Berkeley DB expects file paths to be UTF8 encoded. // _db->open(txn, - IceUtil::nativeToUTF8(IceUtil::getProcessStringConverter(), _dbName).c_str(), + IceUtil::nativeToUTF8(_dbName, IceUtil::getProcessStringConverter()).c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE); // |