summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/exceptions/AllTests.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-08-22 16:28:31 -0230
committerDwayne Boone <dwayne@zeroc.com>2014-08-22 16:28:31 -0230
commit8e63757aa8c07d290856fd987ae78d90ffd2ae16 (patch)
treedfa0189f62bc8373c57604bdb6875fcd825f29a9 /cpp/test/Ice/exceptions/AllTests.cpp
parentICE-5606 renamed ServantLocator::deactivate to destroy (diff)
downloadice-8e63757aa8c07d290856fd987ae78d90ffd2ae16.tar.bz2
ice-8e63757aa8c07d290856fd987ae78d90ffd2ae16.tar.xz
ice-8e63757aa8c07d290856fd987ae78d90ffd2ae16.zip
Revert "ICE-5606 renamed ServantLocator::deactivate to destroy"
This reverts commit 710af6e9ea945157ef8b92112167aeda01b6d383.
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 6bca0e00a76..81a093f5c2c 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -24,7 +24,7 @@ public:
virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&) { return 0; }
virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&) {}
- virtual void destroy(const string&) {}
+ virtual void deactivate(const string&) {}
};
class ObjectFactoryI : virtual public Ice::ObjectFactory