summaryrefslogtreecommitdiff
path: root/cpp/test/Freeze/dbmap/Client.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2008-03-25 12:40:53 -0400
committerBernard Normier <bernard@zeroc.com>2008-03-25 12:40:53 -0400
commitbb285855b093d04e0ccd6083dc24b84f0a41581f (patch)
tree2ff1e2dc84d6e60a6e4d7d69c7ffd249a16add5c /cpp/test/Freeze/dbmap/Client.cpp
parentBug 2860 - skip tests not supported with IPv6 (diff)
downloadice-bb285855b093d04e0ccd6083dc24b84f0a41581f.tar.bz2
ice-bb285855b093d04e0ccd6083dc24b84f0a41581f.tar.xz
ice-bb285855b093d04e0ccd6083dc24b84f0a41581f.zip
Fixed bug #2916
Diffstat (limited to 'cpp/test/Freeze/dbmap/Client.cpp')
-rwxr-xr-x[-rw-r--r--]cpp/test/Freeze/dbmap/Client.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp
index 366ee6dd251..f8840218143 100644..100755
--- a/cpp/test/Freeze/dbmap/Client.cpp
+++ b/cpp/test/Freeze/dbmap/Client.cpp
@@ -59,8 +59,9 @@ FindFirstOfTest(const pair<const Byte, const Int>& p, Byte q)
void
populateDB(const Freeze::ConnectionPtr& connection, ByteIntMap& m)
{
- alphabet.assign(alphabetChars, alphabetChars + sizeof(alphabetChars) - 1);
- size_t length = alphabet.size();
+ vector<Byte> localAlphabet;
+ localAlphabet.assign(alphabetChars, alphabetChars + sizeof(alphabetChars) - 1);
+ size_t length = localAlphabet.size();
for(;;)
{
@@ -69,7 +70,7 @@ populateDB(const Freeze::ConnectionPtr& connection, ByteIntMap& m)
TransactionHolder txHolder(connection);
for(size_t j = 0; j < length; ++j)
{
- m.put(ByteIntMap::value_type(alphabet[j], static_cast<Int>(j)));
+ m.put(ByteIntMap::value_type(localAlphabet[j], static_cast<Int>(j)));
}
txHolder.commit();
break;
@@ -223,6 +224,7 @@ run(const CommunicatorPtr& communicator, const string& envName)
// Populate the database with the alphabet
//
populateDB(connection, m1);
+ alphabet.assign(alphabetChars, alphabetChars + sizeof(alphabetChars) - 1);
//
// Test ==, swap and communicator()
@@ -455,6 +457,7 @@ run(const CommunicatorPtr& communicator, const string& envName)
// Re-populate
//
populateDB(connection, m);
+ alphabet.assign(alphabetChars, alphabetChars + sizeof(alphabetChars) - 1);
cout << "testing algorithms... " << flush;