Fix ObjectFactory deprecate metadata and cleanup

2 files changed, 17 insertions, 27 deletions

diff --git a/cpp/src/Ice/ValueFactoryManager.cpp b/cpp/src/Ice/ValueFactoryManager.cpp
index 141c76d3e63..a1f669cf4c1 100644
--- a/cpp/src/Ice/ValueFactoryManager.cpp
+++ b/cpp/src/Ice/ValueFactoryManager.cpp
@@ -22,20 +22,6 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ValueFactoryManager* p) { return p; }
 
-#ifndef ICE_CPP11_MAPPING
-IceUtil::Shared* IceInternal::upCast(ValueFactoryWrapper* p) { return p; }
-
-ValueFactoryWrapper::ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) : _objectFactory(factory)
-{
-}
-
-Ice::ValuePtr
-ValueFactoryWrapper::create(const string& id)
-{
-    return _objectFactory->create(id);
-}
-#endif
-
 void
 IceInternal::ValueFactoryManager::add(const ICE_VALUE_FACTORY& factory, const string& id)
 {
@@ -78,6 +64,23 @@ IceInternal::ValueFactoryManager::add(const Ice::ObjectFactoryPtr& factory, cons
                                             }
                                         ));
 #else
+
+    class ValueFactoryWrapper: public Ice::ValueFactory
+    {
+    public:
+        ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) :  _objectFactory(factory)
+        {
+        }
+
+        Ice::ValuePtr create(const std::string& id)
+        {
+            return _objectFactory->create(id);
+        }
+
+    private:
+        Ice::ObjectFactoryPtr _objectFactory;
+    };
+
     _factoryMapHint = _factoryMap.insert(_factoryMapHint,
                                          pair<const string, ICE_VALUE_FACTORY>(id, new ValueFactoryWrapper(factory)));
 #endif
diff --git a/cpp/src/Ice/ValueFactoryManager.h b/cpp/src/Ice/ValueFactoryManager.h
index 31b37c9014e..433e9ca3a14 100644
--- a/cpp/src/Ice/ValueFactoryManager.h
+++ b/cpp/src/Ice/ValueFactoryManager.h
@@ -19,19 +19,6 @@
 namespace IceInternal
 {
 
-#ifndef ICE_CPP11_MAPPING
-class ValueFactoryWrapper: public Ice::ValueFactory
-{
-public:
-    ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory);
-
-    Ice::ValuePtr create(const std::string& id);
-
-private:
-    Ice::ObjectFactoryPtr _objectFactory;
-};
-#endif
-
 class ValueFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
 {
 public: