1 files changed, 8 insertions, 29 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 60d7b871275..8d13727d9ea 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -14,7 +14,6 @@
 #include <Ice/ConnectionFactory.h>
 #include <Ice/ReferenceFactory.h>
 #include <Ice/ProxyFactory.h>
-#include <Ice/ValueFactoryManager.h>
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/LocalException.h>
@@ -133,41 +132,15 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout
 void
 Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id)
 {
-    _instance->servantFactoryManager()->add(factory, id);
+    _instance->addObjectFactory(factory, id);
 }
 
 ::Ice::ObjectFactoryPtr
 Ice::CommunicatorI::findObjectFactory(const string& id) const
 {
-    return _instance->servantFactoryManager()->findObjectFactory(id);
+    return _instance->findObjectFactory(id);
 }
 
-#ifdef ICE_CPP11_MAPPING
-void
-Ice::CommunicatorI::addValueFactory(function<::Ice::ValuePtr (string)> factory, const string& id)
-{
-        _instance->servantFactoryManager()->add(move(factory), id);
-}
-
-function<::Ice::ValuePtr (const string&)>
-Ice::CommunicatorI::findValueFactory(const string& id) const
-{
-    return _instance->servantFactoryManager()->find(id);
-}
-#else
-void
-Ice::CommunicatorI::addValueFactory(const ::Ice::ValueFactoryPtr& factory, const string& id)
-{
-    _instance->servantFactoryManager()->add(factory, id);
-}
-
-::Ice::ValueFactoryPtr
-Ice::CommunicatorI::findValueFactory(const string& id) const
-{
-    return _instance->servantFactoryManager()->find(id);
-}
-#endif
-
 PropertiesPtr
 Ice::CommunicatorI::getProperties() const
 {
@@ -222,6 +195,12 @@ Ice::CommunicatorI::getPluginManager() const
     return _instance->pluginManager();
 }
 
+ValueFactoryManagerPtr
+Ice::CommunicatorI::getValueFactoryManager() const
+{
+    return _instance->initializationData().valueFactoryManager;
+}
+
 namespace
 {