summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-12-08 11:33:42 -0500
committerJoe George <joe@zeroc.com>2015-12-08 16:09:24 -0500
commit6a43686ce26de5d2d5edf4a485ecff3a242c26b6 (patch)
treed31e4f16dc9ed6e28056a7224e045a4638955f5e /cpp/src/Ice/Instance.cpp
parentC++11 mapping IceDiscovery plug-in (diff)
downloadice-6a43686ce26de5d2d5edf4a485ecff3a242c26b6.tar.bz2
ice-6a43686ce26de5d2d5edf4a485ecff3a242c26b6.tar.xz
ice-6a43686ce26de5d2d5edf4a485ecff3a242c26b6.zip
ICE-6908 - Add ValueFactory
ValueFactory is a replacement for ObjectFactory (which is still available if needed). It is an interface with only one operation and can has the "delegate" metadata.
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 f3f8e2d768d..4952c61d152 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -18,7 +18,7 @@
#include <Ice/ProxyFactory.h>
#include <Ice/ThreadPool.h>
#include <Ice/ConnectionFactory.h>
-#include <Ice/ObjectFactoryManager.h>
+#include <Ice/ValueFactoryManager.h>
#include <Ice/LocalException.h>
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/Exception.h>
@@ -396,7 +396,7 @@ IceInternal::Instance::outgoingConnectionFactory() const
return _outgoingConnectionFactory;
}
-ObjectFactoryManagerPtr
+ValueFactoryManagerPtr
IceInternal::Instance::servantFactoryManager() const
{
Lock sync(*this);
@@ -1351,7 +1351,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
_outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this);
- _servantFactoryManager = new ObjectFactoryManager();
+ _servantFactoryManager = new ValueFactoryManager();
_objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator);