summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 3a1923c3c75..33895d85e31 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -13,7 +13,7 @@
#include <Ice/ProxyFactory.h>
#include <Ice/ThreadPool.h>
#include <Ice/Emitter.h>
-#include <Ice/ServantFactoryManager.h>
+#include <Ice/ObjectFactoryManager.h>
#include <Ice/UserExceptionFactoryManager.h>
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/Exception.h>
@@ -113,7 +113,7 @@ IceInternal::Instance::emitterFactory()
return _emitterFactory;
}
-ServantFactoryManagerPtr
+ObjectFactoryManagerPtr
IceInternal::Instance::servantFactoryManager()
{
JTCSyncT<JTCMutex> sync(*this);
@@ -252,7 +252,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
_traceLevels = new TraceLevels(_properties);
_proxyFactory = new ProxyFactory(this);
_emitterFactory = new EmitterFactory(this);
- _servantFactoryManager = new ServantFactoryManager();
+ _servantFactoryManager = new ObjectFactoryManager();
_userExceptionFactoryManager = new UserExceptionFactoryManager();
_objectAdapterFactory = new ObjectAdapterFactory(this);
_threadPool = new ThreadPool(this);