diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
| commit | 18a6720fcc3ece576f5fb26283e239cda2bebadd (patch) | |
| tree | a7d9de0acab9e092943fb182fa880b2c4b950db6 /cpp/src/Ice/ACM.h | |
| parent | ICE-6861 - Java stream API changes (diff) | |
| download | ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.bz2 ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.xz ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.zip | |
Refactored invocation code to better suite new C++11 mapping
Diffstat (limited to 'cpp/src/Ice/ACM.h')
| -rw-r--r-- | cpp/src/Ice/ACM.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h index 0290a179ab8..3328b5038d9 100644 --- a/cpp/src/Ice/ACM.h +++ b/cpp/src/Ice/ACM.h @@ -19,6 +19,7 @@ #include <Ice/InstanceF.h> #include <Ice/PropertiesF.h> #include <Ice/LoggerF.h> +#include <Ice/VirtualShared.h> #include <set> namespace IceInternal @@ -44,14 +45,13 @@ public: virtual void remove(const Ice::ConnectionIPtr&) = 0; virtual void reap(const Ice::ConnectionIPtr&) = 0; - virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, - const IceUtil::Optional<Ice::ACMClose>&, + virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, + const IceUtil::Optional<Ice::ACMClose>&, const IceUtil::Optional<Ice::ACMHeartbeat>&) = 0; virtual Ice::ACM getACM() = 0; }; -class FactoryACMMonitor : public ACMMonitor, public ::IceUtil::Mutex, - public Ice::EnableSharedFromThis<FactoryACMMonitor> +class FactoryACMMonitor : public ACMMonitor, public IceUtil::Mutex, public Ice::EnableSharedFromThis<FactoryACMMonitor> { public: @@ -62,8 +62,8 @@ public: virtual void remove(const Ice::ConnectionIPtr&); virtual void reap(const Ice::ConnectionIPtr&); - virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, - const IceUtil::Optional<Ice::ACMClose>&, + virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, + const IceUtil::Optional<Ice::ACMClose>&, const IceUtil::Optional<Ice::ACMHeartbeat>&); virtual Ice::ACM getACM(); @@ -86,7 +86,8 @@ private: std::vector<Ice::ConnectionIPtr> _reapedConnections; }; -class ConnectionACMMonitor : public ACMMonitor, public ::IceUtil::Mutex, +class ConnectionACMMonitor : public ACMMonitor, + public IceUtil::Mutex, public Ice::EnableSharedFromThis<ConnectionACMMonitor> { public: @@ -98,8 +99,8 @@ public: virtual void remove(const Ice::ConnectionIPtr&); virtual void reap(const Ice::ConnectionIPtr&); - virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, - const IceUtil::Optional<Ice::ACMClose>&, + virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, + const IceUtil::Optional<Ice::ACMClose>&, const IceUtil::Optional<Ice::ACMHeartbeat>&); virtual Ice::ACM getACM(); |