summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/FactoryTable.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-02-03 10:42:29 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-02-03 10:42:29 +0100
commit18a6720fcc3ece576f5fb26283e239cda2bebadd (patch)
treea7d9de0acab9e092943fb182fa880b2c4b950db6 /cpp/include/Ice/FactoryTable.h
parentICE-6861 - Java stream API changes (diff)
downloadice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.bz2
ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.xz
ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.zip
Refactored invocation code to better suite new C++11 mapping
Diffstat (limited to 'cpp/include/Ice/FactoryTable.h')
-rw-r--r--cpp/include/Ice/FactoryTable.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index 03362685c43..24fb649d053 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -38,11 +38,7 @@ public:
Ice::UserExceptionFactoryPtr getExceptionFactory(const ::std::string&) const;
void removeExceptionFactory(const ::std::string&);
-#ifdef ICE_CPP11_MAPPING
- void addValueFactory(const ::std::string&, ::std::function<::Ice::ValuePtr (::std::string)>);
-#else
- void addValueFactory(const ::std::string&, const ::Ice::ValueFactoryPtr&);
-#endif
+ void addValueFactory(const ::std::string&, ICE_IN(ICE_VALUE_FACTORY));
ICE_VALUE_FACTORY getValueFactory(const ::std::string&) const;
void removeValueFactory(const ::std::string&);