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/include | |
| 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/include')
| -rw-r--r-- | cpp/include/Ice/MetricsAdminI.h | 10 | ||||
| -rw-r--r-- | cpp/include/Slice/CPlusPlusUtil.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h index bd58a673435..5ce78e054fc 100644 --- a/cpp/include/Ice/MetricsAdminI.h +++ b/cpp/include/Ice/MetricsAdminI.h @@ -645,6 +645,14 @@ public: void unregisterMap(const std::string&); virtual Ice::StringSeq getMetricsViewNames(Ice::StringSeq&, const ::Ice::Current&); + +#ifdef ICE_CPP11_MAPPING + virtual void enableMetricsView(std::string, const ::Ice::Current&); + virtual void disableMetricsView(std::string, const ::Ice::Current&); + virtual IceMX::MetricsView getMetricsView(std::string, Ice::Long&, const ::Ice::Current&); + virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(std::string, std::string, const ::Ice::Current&); + virtual IceMX::MetricsFailures getMetricsFailures(std::string, std::string, std::string, const ::Ice::Current&); +#else virtual void enableMetricsView(const std::string&, const ::Ice::Current&); virtual void disableMetricsView(const std::string&, const ::Ice::Current&); virtual IceMX::MetricsView getMetricsView(const std::string&, Ice::Long&, const ::Ice::Current&); @@ -652,7 +660,7 @@ public: const ::Ice::Current&); virtual IceMX::MetricsFailures getMetricsFailures(const std::string&, const std::string&, const std::string&, const ::Ice::Current&); - +#endif std::vector<MetricsMapIPtr> getMaps(const std::string&) const; const Ice::LoggerPtr& getLogger() const; diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index 413a855e2d3..ab0a0c6f2fb 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -35,6 +35,7 @@ const int TypeContextAMICallPrivateEnd = 8; const int TypeContextUseWstring = 16; const int TypeContextReadClosure = 32; const int TypeContextLocalOperation = 64; +const int TypeContextAMD = 128; SLICE_API bool isMovable(const TypePtr&); |