summaryrefslogtreecommitdiff
path: root/cpp/src/Freeze/MapI.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2007-11-05 23:48:51 +1000
committerMichi Henning <michi@zeroc.com>2007-11-05 23:48:51 +1000
commited2d219830a72554d2110e90bb79189f16e24cfa (patch)
tree23dc22d4f5216f691e53b54b4a26b07c419ca594 /cpp/src/Freeze/MapI.cpp
parentBug 2522 for C++ and Java. (diff)
parentFix VC60 compilation problems (diff)
downloadice-ed2d219830a72554d2110e90bb79189f16e24cfa.tar.bz2
ice-ed2d219830a72554d2110e90bb79189f16e24cfa.tar.xz
ice-ed2d219830a72554d2110e90bb79189f16e24cfa.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Freeze/MapI.cpp')
-rw-r--r--cpp/src/Freeze/MapI.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp
index ff8ffb916ee..390b4253ccb 100644
--- a/cpp/src/Freeze/MapI.cpp
+++ b/cpp/src/Freeze/MapI.cpp
@@ -1317,14 +1317,11 @@ Freeze::MapHelperI::close()
_connection->unregisterMap(this);
}
_db = 0;
-
- for(IndexMap::iterator p = _indices.begin(); p != _indices.end(); ++p)
- {
- MapIndexBasePtr& indexBase = p->second;
- indexBase->_impl = 0;
- indexBase->_map = 0;
- }
+ //
+ // We can't clear the indexBase as MapIndexI is using
+ // the first map's indexBase objects
+ //
_indices.clear();
}