diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-17 21:18:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-17 21:18:41 +0200 |
| commit | bd89ff1000cb22a33e4d1a614600f5dc0486f4d3 (patch) | |
| tree | f9f28c1c0067b1f4b119d3d9c4576c09b4c27db8 /cpp/src/Ice/MetricsAdminI.cpp | |
| parent | WinRT build and code fixes (diff) | |
| download | ice-bd89ff1000cb22a33e4d1a614600f5dc0486f4d3.tar.bz2 ice-bd89ff1000cb22a33e4d1a614600f5dc0486f4d3.tar.xz ice-bd89ff1000cb22a33e4d1a614600f5dc0486f4d3.zip | |
Fix related to ICE-4847
Diffstat (limited to 'cpp/src/Ice/MetricsAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index 8322dae4898..2d04aa58bf4 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -191,7 +191,7 @@ MetricsMapI::MetricsMapI(const MetricsMapI& map) : { } -const Ice::PropertyDict& +const ::Ice::PropertyDict& MetricsMapI::getProperties() const { return _properties; @@ -223,7 +223,7 @@ MetricsViewI::destroy() bool MetricsViewI::addOrUpdateMap(const PropertiesPtr& properties, const string& mapName, - const MetricsMapFactoryPtr& factory, const Ice::LoggerPtr& logger) + const MetricsMapFactoryPtr& factory, const ::Ice::LoggerPtr& logger) { // // Add maps to views configured with the given map. @@ -289,12 +289,12 @@ MetricsViewI::addOrUpdateMap(const PropertiesPtr& properties, const string& mapN } catch(const std::exception& ex) { - Ice::Warning warn(logger); + ::Ice::Warning warn(logger); warn << "unexpected exception while creating metrics map:\n" << ex; } catch(const string& msg) { - Ice::Warning warn(logger); + ::Ice::Warning warn(logger); warn << msg; } return true; @@ -503,7 +503,7 @@ MetricsAdminI::getMetricsViewNames(const Current&) } MetricsView -MetricsAdminI::getMetricsView(const string& view, Ice::Long& timestamp, const Current&) +MetricsAdminI::getMetricsView(const string& view, ::Ice::Long& timestamp, const Current&) { Lock sync(*this); std::map<string, MetricsViewIPtr>::const_iterator p = _views.find(view); @@ -562,7 +562,7 @@ MetricsAdminI::getLogger() const } void -MetricsAdminI::setProperties(const Ice::PropertiesPtr& properties) +MetricsAdminI::setProperties(const ::Ice::PropertiesPtr& properties) { _properties = properties; } @@ -581,7 +581,7 @@ MetricsAdminI::updated(const PropertyDict& props) } catch(const std::exception& ex) { - Ice::Warning warn(_logger); + ::Ice::Warning warn(_logger); warn << "unexpected exception while updating metrics view configuration:\n" << ex.what(); } return; |