diff options
| author | Jose <jose@zeroc.com> | 2015-12-09 23:09:20 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-09 23:09:20 +0100 |
| commit | a00673a2c1d9634102f91b7c6ebdd453d55a708f (patch) | |
| tree | 2097f43ff5a1516b353ed0e88cc7b4174a518a17 /cpp/src/Ice/PropertiesAdminI.cpp | |
| parent | Windows build fixes (diff) | |
| download | ice-a00673a2c1d9634102f91b7c6ebdd453d55a708f.tar.bz2 ice-a00673a2c1d9634102f91b7c6ebdd453d55a708f.tar.xz ice-a00673a2c1d9634102f91b7c6ebdd453d55a708f.zip | |
C++11 mapping server side input parameter fixes
Diffstat (limited to 'cpp/src/Ice/PropertiesAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertiesAdminI.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp index 4cd90f614ba..bcf0370c245 100644 --- a/cpp/src/Ice/PropertiesAdminI.cpp +++ b/cpp/src/Ice/PropertiesAdminI.cpp @@ -30,14 +30,22 @@ PropertiesAdminI::PropertiesAdminI(const PropertiesPtr& properties, const Logger } string +#ifdef ICE_CPP11_MAPPING +PropertiesAdminI::getProperty(string name, const Current&) +#else PropertiesAdminI::getProperty(const string& name, const Current&) +#endif { Lock sync(*this); return _properties->getProperty(name); } PropertyDict +#ifdef ICE_CPP11_MAPPING +PropertiesAdminI::getPropertiesForPrefix(string prefix, const Current&) +#else PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&) +#endif { Lock sync(*this); return _properties->getPropertiesForPrefix(prefix); @@ -45,9 +53,9 @@ PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&) void #ifdef ICE_CPP11_MAPPING -PropertiesAdminI::setProperties_async(const PropertyDict& props, +PropertiesAdminI::setProperties_async(PropertyDict props, function<void ()> response, - function<void (const ::std::exception_ptr&)>, + function<void (exception_ptr)>, const Current&) #else PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr& cb, const PropertyDict& props, |