summaryrefslogtreecommitdiff
path: root/python/modules/IcePy/ObjectFactory.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-12-17 09:58:11 -0500
committerJoe George <joe@zeroc.com>2015-12-17 10:27:29 -0500
commit1ea2a111f3a0871b197e41750a0805d52b8eaa0a (patch)
treef181a7cfe3f835d4377b52bdeabebff3b6f97806 /python/modules/IcePy/ObjectFactory.cpp
parentC++11 mapping test updates (diff)
downloadice-1ea2a111f3a0871b197e41750a0805d52b8eaa0a.tar.bz2
ice-1ea2a111f3a0871b197e41750a0805d52b8eaa0a.tar.xz
ice-1ea2a111f3a0871b197e41750a0805d52b8eaa0a.zip
ICE-6897 - Python and Objective-C ValueFactory
- ValueFactory's are now functions/lambdas in Python and blocks in Objective-C
Diffstat (limited to 'python/modules/IcePy/ObjectFactory.cpp')
-rw-r--r--python/modules/IcePy/ObjectFactory.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/python/modules/IcePy/ObjectFactory.cpp b/python/modules/IcePy/ObjectFactory.cpp
index d3720714a29..376b5c83697 100644
--- a/python/modules/IcePy/ObjectFactory.cpp
+++ b/python/modules/IcePy/ObjectFactory.cpp
@@ -74,7 +74,7 @@ IcePy::ObjectFactory::create(const string& id)
//
// Invoke the create method on the Python factory object.
//
- PyObjectHandle obj = PyObject_CallMethod(factory, STRCAST("create"), STRCAST("s"), id.c_str());
+ PyObjectHandle obj = PyObject_CallFunction(factory, STRCAST("s"), id.c_str());
if(!obj.get())
{
assert(PyErr_Occurred());
@@ -182,8 +182,6 @@ IcePy::ObjectFactory::addObjectFactory(PyObject* factory, const string& id)
return false;
}
- _valueFactoryMap.insert(FactoryMap::value_type(id, factory));
- Py_INCREF(factory);
_objectFactoryMap.insert(FactoryMap::value_type(id, factory));
Py_INCREF(factory);