summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertiesAdminI.h
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-12-09 23:09:20 +0100
committerJose <jose@zeroc.com>2015-12-09 23:09:20 +0100
commita00673a2c1d9634102f91b7c6ebdd453d55a708f (patch)
tree2097f43ff5a1516b353ed0e88cc7b4174a518a17 /cpp/src/Ice/PropertiesAdminI.h
parentWindows build fixes (diff)
downloadice-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.h')
-rw-r--r--cpp/src/Ice/PropertiesAdminI.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h
index 789a6aee6d5..4f23521e399 100644
--- a/cpp/src/Ice/PropertiesAdminI.h
+++ b/cpp/src/Ice/PropertiesAdminI.h
@@ -25,13 +25,16 @@ public:
PropertiesAdminI(const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
- virtual std::string getProperty(const std::string&, const Ice::Current&);
- virtual Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&);
-
#ifdef ICE_CPP11_MAPPING
- virtual void setProperties_async(const ::Ice::PropertyDict&, ::std::function<void ()>,
- ::std::function<void (const ::std::exception_ptr&)>, const Ice::Current&);
+ virtual std::string getProperty(std::string, const Ice::Current&);
+ virtual Ice::PropertyDict getPropertiesForPrefix(std::string, const Ice::Current&);
+ virtual void setProperties_async(::Ice::PropertyDict,
+ ::std::function<void ()>,
+ ::std::function<void (::std::exception_ptr)>,
+ const Ice::Current&);
#else
+ virtual std::string getProperty(const std::string&, const Ice::Current&);
+ virtual Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&);
virtual void setProperties_async(const Ice::AMD_PropertiesAdmin_setPropertiesPtr&, const Ice::PropertyDict&, const Ice::Current&);
#endif