diff options
| author | Jose <jose@zeroc.com> | 2009-11-10 05:30:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-11-10 05:30:26 +0100 |
| commit | 4247c9e2c2612394a5f4d63a65ba538f975906d4 (patch) | |
| tree | 96d3308681d9b0684ce5dd763f5a5d415eaf09d7 /cpp/src/Freeze/MapI.cpp | |
| parent | Win32 64 bits compilation error (diff) | |
| download | ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.tar.bz2 ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.tar.xz ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.zip | |
Fixed 3962 - Berkeley DB, problems with unicode paths.
Diffstat (limited to 'cpp/src/Freeze/MapI.cpp')
| -rw-r--r-- | cpp/src/Freeze/MapI.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp index 9f92b12de32..443f353b402 100644 --- a/cpp/src/Freeze/MapI.cpp +++ b/cpp/src/Freeze/MapI.cpp @@ -17,6 +17,8 @@ #include <IceUtil/UUID.h> #include <stdlib.h> +#include <Ice/StringConverter.h> + using namespace std; using namespace Ice; using namespace Freeze; @@ -200,7 +202,10 @@ Freeze::MapHelper::recreate(const Freeze::ConnectionPtr& connection, // Fortunately, DB closes oldDb automatically when it goes out of scope // Db oldDb(connectionI->dbEnv()->getEnv(), 0); - oldDb.open(txn, oldDbName.c_str(), 0, DB_BTREE, DB_THREAD, FREEZE_DB_MODE); + + + oldDb.open(txn, Ice::nativeToUTF8(connectionI->communicator(), oldDbName).c_str(), 0, DB_BTREE, + DB_THREAD, FREEZE_DB_MODE); auto_ptr<MapDb> newDb(new MapDb(connectionI, dbName, key, value, keyCompare, indices, true)); @@ -1675,7 +1680,8 @@ Freeze::MapIndexI::MapIndexI(const ConnectionIPtr& connection, MapDb& db, out << "Opening index \"" << _dbName << "\""; } - _db->open(txn, _dbName.c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE); + _db->open(txn, Ice::nativeToUTF8(connection->communicator(), _dbName).c_str(), 0, DB_BTREE, flags, + FREEZE_DB_MODE); // // To populate empty indices |