diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-16 12:15:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-16 12:15:14 +0200 |
| commit | 1edb603754a8ab3922a3b9b8c69e0dd3614e0dab (patch) | |
| tree | d5d56c91a42187cbd68b0dcf65e95eab68cde22d /cpp/src/Ice/Instance.h | |
| parent | ICE-4856 - Fix multicast for JDK 7 (diff) | |
| download | ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.tar.bz2 ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.tar.xz ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.zip | |
Fixed IceMX race condition, VC9 build
Diffstat (limited to 'cpp/src/Ice/Instance.h')
| -rw-r--r-- | cpp/src/Ice/Instance.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 860c68b2802..4f81d124286 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -51,6 +51,9 @@ class CommunicatorI; namespace IceInternal { +class MetricsAdminI; +typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr; + class Instance : public IceUtil::Shared, public IceUtil::RecMutex { public: @@ -144,6 +147,7 @@ private: Ice::FacetMap _adminFacets; Ice::Identity _adminIdentity; std::set<std::string> _adminFacetFilter; + IceInternal::MetricsAdminIPtr _metricsAdmin; }; class ProcessI : public Ice::Process |