summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ACM.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-13 14:39:41 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-13 14:39:41 +0200
commitc43d26cb98eb2ab48910f96600b9f402a15af499 (patch)
treefde5db315a9d2da61235938f70c0be38cadc0bf1 /cpp/src/Ice/ACM.h
parentOnly install zeroc.ice.v140 when ICE_BIN_DIST == cpp (diff)
downloadice-c43d26cb98eb2ab48910f96600b9f402a15af499.tar.bz2
ice-c43d26cb98eb2ab48910f96600b9f402a15af499.tar.xz
ice-c43d26cb98eb2ab48910f96600b9f402a15af499.zip
Another fix for ICE-8015 - clearing connections from ACM monitor
Diffstat (limited to 'cpp/src/Ice/ACM.h')
-rw-r--r--cpp/src/Ice/ACM.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h
index 169efd984db..77ca93a121a 100644
--- a/cpp/src/Ice/ACM.h
+++ b/cpp/src/Ice/ACM.h
@@ -50,7 +50,7 @@ public:
virtual Ice::ACM getACM() = 0;
};
-class FactoryACMMonitor : public ACMMonitor, public IceUtil::Mutex
+class FactoryACMMonitor : public ACMMonitor, public IceUtil::Monitor<IceUtil::Mutex>
#ifdef ICE_CPP11_MAPPING
, public std::enable_shared_from_this<FactoryACMMonitor>
#endif