diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-12 11:34:53 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-12 11:34:53 +0200 |
| commit | 23c1e3b603a9d902593ffe9f99562fcda3af1589 (patch) | |
| tree | 60ea7cdc0da5a9676ca12350ac82b069cc86eb5e /cpp/src/IceBox/ServiceManagerI.cpp | |
| parent | .NET demo project updates (diff) | |
| download | ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.tar.bz2 ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.tar.xz ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.zip | |
Added support for Glacier2 MX and fixed ICE-4880
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index a81e2a2ea54..9e502517686 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -403,10 +403,10 @@ IceBox::ServiceManagerI::start() // shared communicator. // IceInternal::MetricsAdminIPtr metricsAdmin; - if(IceMX::CommunicatorObserverIPtr::dynamicCast(_communicator->getObserver())) + if(IceInternal::CommunicatorObserverIPtr::dynamicCast(_communicator->getObserver())) { metricsAdmin = new IceInternal::MetricsAdminI(initData.properties, getProcessLogger()); - initData.observer = new IceMX::CommunicatorObserverI(metricsAdmin); + initData.observer = new IceInternal::CommunicatorObserverI(metricsAdmin); } _sharedCommunicator = initialize(initData); @@ -557,7 +557,8 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, { assert(_sharedCommunicator); communicator = _sharedCommunicator; - IceMX::CommunicatorObserverIPtr o = IceMX::CommunicatorObserverIPtr::dynamicCast(communicator->getObserver()); + IceInternal::CommunicatorObserverIPtr o = + IceInternal::CommunicatorObserverIPtr::dynamicCast(communicator->getObserver()); if(o) { metricsAdmin = o->getMetricsAdmin(); @@ -598,10 +599,10 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, // If Ice metrics are enabled on the IceBox communicator, we also enable them on // the service communicator. // - if(IceMX::CommunicatorObserverIPtr::dynamicCast(_communicator->getObserver())) + if(IceInternal::CommunicatorObserverIPtr::dynamicCast(_communicator->getObserver())) { metricsAdmin = new IceInternal::MetricsAdminI(initData.properties, initData.logger); - initData.observer = new IceMX::CommunicatorObserverI(metricsAdmin); + initData.observer = new IceInternal::CommunicatorObserverI(metricsAdmin); } // |