1 files changed, 74 insertions, 0 deletions
diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp
new file mode 100644
index 00000000000..3f914041734
--- /dev/null
+++ b/cpp/src/Ice/ValueFactoryManagerI.cpp
@@ -0,0 +1,74 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceUtil/DisableWarnings.h>
+#include <Ice/ValueFactoryManagerI.h>
+#include <Ice/LocalException.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+void
+#ifdef ICE_CPP11_MAPPING
+IceInternal::ValueFactoryManagerI::add(function<Ice::ValuePtr (string)> factory, const string& id)
+#else
+IceInternal::ValueFactoryManagerI::add(const Ice::ValueFactoryPtr& factory, const string& id)
+#endif
+{
+    IceUtil::Mutex::Lock sync(*this);
+
+    if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
+       || _factoryMap.find(id) != _factoryMap.end())
+    {
+        AlreadyRegisteredException ex(__FILE__, __LINE__);
+        ex.kindOfObject = "value factory";
+        ex.id = id;
+        throw ex;
+    }
+
+    _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_VALUE_FACTORY>(id, factory));
+}
+
+ICE_VALUE_FACTORY
+IceInternal::ValueFactoryManagerI::find(const string& id) const
+{
+    IceUtil::Mutex::Lock sync(*this);
+
+    FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap);
+
+    FactoryMap::iterator p = factoryMap.end();
+    if(_factoryMapHint != factoryMap.end())
+    {
+        if(_factoryMapHint->first == id)
+        {
+            p = _factoryMapHint;
+        }
+    }
+
+    if(p == factoryMap.end())
+    {
+        p = factoryMap.find(id);
+    }
+
+    if(p != factoryMap.end())
+    {
+        _factoryMapHint = p;
+        return p->second;
+    }
+    else
+    {
+        return ICE_NULLPTR;
+    }
+}
+
+IceInternal::ValueFactoryManagerI::ValueFactoryManagerI() :
+    _factoryMapHint(_factoryMap.end())
+{
+}