6 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index d7833aa945d..a5d337f714d 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -394,7 +394,7 @@ Freeze::EvictorI::finished(const Current& current, const ObjectPtr& servant, con
 }
 
 void
-Freeze::EvictorI::deactivate()
+Freeze::EvictorI::deactivate(const string&)
 {
     IceUtil::Mutex::Lock sync(*this);
 
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index 61428981bcf..80ce52501c4 100644
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -49,7 +49,7 @@ public:
 
     virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);
     virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
-    virtual void deactivate();
+    virtual void deactivate(const std::string&);
 
     virtual void save(const Ice::Identity&, const Ice::ObjectPtr&);
 
diff --git a/cpp/src/Glacier/GlacierRouter.cpp b/cpp/src/Glacier/GlacierRouter.cpp
index b538fa6ae79..60c5c3a935f 100644
--- a/cpp/src/Glacier/GlacierRouter.cpp
+++ b/cpp/src/Glacier/GlacierRouter.cpp
@@ -37,7 +37,7 @@ public:
     
     virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);
     virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
-    virtual void deactivate();
+    virtual void deactivate(const string&);
 
 private:
 
@@ -72,7 +72,7 @@ Glacier::ServantLocator::finished(const Current&, const ObjectPtr&, const LocalO
 }
 
 void
-Glacier::ServantLocator::deactivate()
+Glacier::ServantLocator::deactivate(const string&)
 {
     ClientBlobject* clientBlobject = dynamic_cast<ClientBlobject*>(_blobject.get());
     if(clientBlobject)
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 6b01f5f74ae..5dbc853abe9 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -134,7 +134,7 @@ IceInternal::ServantManager::removeServantLocator(const string& prefix)
 	_locatorMapHint = _locatorMap.end();
     }
 
-    locator->deactivate();
+    locator->deactivate(prefix);
 }
 
 ServantLocatorPtr
@@ -197,7 +197,7 @@ IceInternal::ServantManager::destroy()
     {
 	try
 	{
-	    p->second->deactivate();
+	    p->second->deactivate(p->first);
 	}
 	catch(const Exception& ex)
 	{
diff --git a/cpp/src/IcePatch/FileLocator.cpp b/cpp/src/IcePatch/FileLocator.cpp
index c32ba18af24..4fca6e31b01 100644
--- a/cpp/src/IcePatch/FileLocator.cpp
+++ b/cpp/src/IcePatch/FileLocator.cpp
@@ -107,7 +107,7 @@ IcePatch::FileLocator::finished(const Current& current, const ObjectPtr&,
 }
 
 void
-IcePatch::FileLocator::deactivate()
+IcePatch::FileLocator::deactivate(const std::string&)
 {
     //
     // Break cyclic dependencies.
diff --git a/cpp/src/IcePatch/FileLocator.h b/cpp/src/IcePatch/FileLocator.h
index 8eb2909e3a5..76888dba293 100644
--- a/cpp/src/IcePatch/FileLocator.h
+++ b/cpp/src/IcePatch/FileLocator.h
@@ -31,7 +31,7 @@ public:
 
     virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
 
-    virtual void deactivate();
+    virtual void deactivate(const std::string&);
 
 private: