summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox/ServiceManagerI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-09-17 10:16:43 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-09-17 10:16:43 +0200
commit5a85eebb5e9162260ffb93f217b16f229976288b (patch)
tree93ca91d69e9303d4895d743b7bc08d77741bdb7f /cpp/src/IceBox/ServiceManagerI.cpp
parentFixed to remove need for calling updateViews after map registration (diff)
downloadice-5a85eebb5e9162260ffb93f217b16f229976288b.tar.bz2
ice-5a85eebb5e9162260ffb93f217b16f229976288b.tar.xz
ice-5a85eebb5e9162260ffb93f217b16f229976288b.zip
Moved some MX classes to IceInternal
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 32f2ea920cc..b310fa6e14b 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -406,10 +406,10 @@ IceBox::ServiceManagerI::start()
// If Ice metrics are enabled on the IceBox communicator, we also enable them on the
// shared communicator.
//
- IceMX::MetricsAdminIPtr metricsAdmin;
+ IceInternal::MetricsAdminIPtr metricsAdmin;
if(IceMX::CommunicatorObserverIPtr::dynamicCast(_communicator->getObserver()))
{
- metricsAdmin = new IceMX::MetricsAdminI(initData.properties, getProcessLogger());
+ metricsAdmin = new IceInternal::MetricsAdminI(initData.properties, getProcessLogger());
initData.observer = new IceMX::CommunicatorObserverI(metricsAdmin);
}
@@ -556,7 +556,7 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint,
// property set.
//
Ice::CommunicatorPtr communicator;
- IceMX::MetricsAdminIPtr metricsAdmin;
+ IceInternal::MetricsAdminIPtr metricsAdmin;
if(_communicator->getProperties()->getPropertyAsInt("IceBox.UseSharedCommunicator." + service) > 0)
{
assert(_sharedCommunicator);
@@ -604,7 +604,7 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint,
//
if(IceMX::CommunicatorObserverIPtr::dynamicCast(_communicator->getObserver()))
{
- metricsAdmin = new IceMX::MetricsAdminI(initData.properties, initData.logger);
+ metricsAdmin = new IceInternal::MetricsAdminI(initData.properties, initData.logger);
initData.observer = new IceMX::CommunicatorObserverI(metricsAdmin);
}