summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/ObjectAdapter.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-06-07 15:23:05 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-06-07 15:23:05 +0000
commit8159773193ab95b7b35aec8cba4cc03f473c0dda (patch)
treedd0ec9401db8dd8b588465a62fa6662c4f523cc3 /cppe/src/IceE/ObjectAdapter.cpp
parentIceGrid Win32 fixes (diff)
downloadice-8159773193ab95b7b35aec8cba4cc03f473c0dda.tar.bz2
ice-8159773193ab95b7b35aec8cba4cc03f473c0dda.tar.xz
ice-8159773193ab95b7b35aec8cba4cc03f473c0dda.zip
Fixed bug 1042
Diffstat (limited to 'cppe/src/IceE/ObjectAdapter.cpp')
-rw-r--r--cppe/src/IceE/ObjectAdapter.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index ea2253b0c44..e6c5810ae1f 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -341,13 +341,6 @@ Ice::ObjectAdapter::waitForDeactivate()
}
}
-void
-Ice::ObjectAdapter::destroy()
-{
- deactivate();
- waitForDeactivate();
-}
-
ObjectPrx
Ice::ObjectAdapter::add(const ObjectPtr& object, const Identity& ident)
{