diff options
| author | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
| commit | 2029ff368e49fae489b8ec8fc12f7d126b182dfb (patch) | |
| tree | 6075d652b7851831c39e6f22004d8720864f1a60 /cpp/src/Ice/PropertiesAdminI.cpp | |
| parent | The default LMDB map size for IceGrid and IceStorm is now 10MB (Windows) (diff) | |
| download | ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.bz2 ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.xz ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.zip | |
C++11 mapping initial commit
Diffstat (limited to 'cpp/src/Ice/PropertiesAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertiesAdminI.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp index 58095fbf0dc..4cd90f614ba 100644 --- a/cpp/src/Ice/PropertiesAdminI.cpp +++ b/cpp/src/Ice/PropertiesAdminI.cpp @@ -44,8 +44,15 @@ PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&) } void +#ifdef ICE_CPP11_MAPPING +PropertiesAdminI::setProperties_async(const PropertyDict& props, + function<void ()> response, + function<void (const ::std::exception_ptr&)>, + const Current&) +#else PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr& cb, const PropertyDict& props, - const Current&) + const Current&) +#endif { Lock sync(*this); @@ -164,7 +171,11 @@ PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr // Send the response now so that we do not block the client during // the call to the update callback. // +#ifdef ICE_CPP11_MAPPING + response(); +#else cb->ice_response(); +#endif // // Copy the callbacks to allow callbacks to update the callbacks. |