summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-09-18 20:54:44 +0000
committerMarc Laukien <marc@zeroc.com>2001-09-18 20:54:44 +0000
commit7ee44fe640ebeda72bea3fe271fa352cff4870c5 (patch)
tree1a9d1e700b208054e8ecfb66ce3bd1b25e0d50dd /cpp/src
parentmake phonebook demo signal-safe (diff)
downloadice-7ee44fe640ebeda72bea3fe271fa352cff4870c5.tar.bz2
ice-7ee44fe640ebeda72bea3fe271fa352cff4870c5.tar.xz
ice-7ee44fe640ebeda72bea3fe271fa352cff4870c5.zip
fixes
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Freeze/DBI.cpp5
-rw-r--r--cpp/src/Freeze/freeze.dsp4
2 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index 367f89a5531..480efafa853 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -402,11 +402,10 @@ Freeze::DBEnvI::close()
return;
}
- for (map<string, DBPtr>::iterator p = _dbmap.begin(); p != _dbmap.end(); ++p)
+ while(!_dbmap.empty())
{
- p->second->close();
+ _dbmap.begin()->second->close();
}
- _dbmap.clear();
int ret = _dbenv->close(_dbenv, 0);
if(ret != 0)
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index d6ae8ca5796..4f3dd1b4e91 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -58,7 +58,7 @@ LINK32=link.exe
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Release\icepack001.* ..\..\lib
+PostBuild_Cmds=copy Release\freeze001.* ..\..\lib
# End Special Build Tool
!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
@@ -90,7 +90,7 @@ LINK32=link.exe
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Debug\icepack001d.* ..\..\lib
+PostBuild_Cmds=copy Debug\freeze001d.* ..\..\lib
# End Special Build Tool
!ENDIF