Fix related to ICE-4847

4 files changed, 27 insertions, 27 deletions

diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index 5e9fe6e1d1d..bfe0ec51f6b 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -234,13 +234,13 @@ protected:
         }
 
         static std::string
-        toString(const Ice::EndpointPtr& e)
+        toString(const ::Ice::EndpointPtr& e)
         {
             return e->toString();
         }
 
         static std::string
-        toString(const Ice::ConnectionPtr& e)
+        toString(const ::Ice::ConnectionPtr& e)
         {
             return e->toString();
         }
@@ -290,7 +290,7 @@ newUpdater(const IceInternal::Handle<T>& updater, void (T::*fn)())
     return new UpdaterT<T>(updater.get(), fn);
 }
 
-template<typename T> class ObserverT : virtual public Ice::Instrumentation::Observer
+template<typename T> class ObserverT : virtual public ::Ice::Instrumentation::Observer
 {
 public:
 
@@ -311,7 +311,7 @@ public:
     virtual void 
     detach()
     {
-        Ice::Long lifetime = _watch.stop();
+        ::Ice::Long lifetime = _watch.stop();
         for(typename EntrySeqType::const_iterator p = _objects.begin(); p != _objects.end(); ++p)
         {
             (*p)->detach(lifetime);
diff --git a/cpp/src/Glacier2/InstrumentationI.cpp b/cpp/src/Glacier2/InstrumentationI.cpp
index cfcbe5818d9..57269b1db46 100644
--- a/cpp/src/Glacier2/InstrumentationI.cpp
+++ b/cpp/src/Glacier2/InstrumentationI.cpp
@@ -40,7 +40,7 @@ public:
     };
     static Attributes attributes;
     
-    SessionHelper(const string& instanceName, const string& id, const Ice::ConnectionPtr& connection, int rtSize) :
+    SessionHelper(const string& instanceName, const string& id, const ::Ice::ConnectionPtr& connection, int rtSize) :
         _instanceName(instanceName), _id(id), _connection(connection), _routingTableSize(rtSize)
     {
     }
@@ -65,25 +65,25 @@ public:
         return _id;
     }
     
-    Ice::ConnectionInfoPtr
+    ::Ice::ConnectionInfoPtr
     getConnectionInfo() const
     {
         return _connection->getInfo();
     }
 
-    Ice::EndpointPtr
+    ::Ice::EndpointPtr
     getEndpoint() const
     {
         return _connection->getEndpoint();
     }
 
-    const Ice::ConnectionPtr&
+    const ::Ice::ConnectionPtr&
     getConnection() const
     {
         return _connection;
     }
 
-    const Ice::EndpointInfoPtr&
+    const ::Ice::EndpointInfoPtr&
     getEndpointInfo() const
     {
         if(!_endpointInfo)
@@ -97,9 +97,9 @@ private:
 
     const string& _instanceName;
     const string& _id;
-    const Ice::ConnectionPtr& _connection;
+    const ::Ice::ConnectionPtr& _connection;
     const int _routingTableSize;
-    mutable Ice::EndpointInfoPtr _endpointInfo;
+    mutable ::Ice::EndpointInfoPtr _endpointInfo;
 };
 
 SessionHelper::Attributes SessionHelper::attributes;
@@ -191,7 +191,7 @@ RouterObserverI::setObserverUpdater(const ObserverUpdaterPtr& updater)
 
 SessionObserverPtr
 RouterObserverI::getSessionObserver(const string& id, 
-                                    const Ice::ConnectionPtr& connection, 
+                                    const ::Ice::ConnectionPtr& connection, 
                                     int routingTableSize,
                                     const SessionObserverPtr& old)
 {
@@ -203,7 +203,7 @@ RouterObserverI::getSessionObserver(const string& id,
         }
         catch(const exception& ex)
         {
-            Ice::Error error(_metrics->getLogger());
+            ::Ice::Error error(_metrics->getLogger());
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
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;
diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp
index 1e8e9d25fcf..aa4c8478c9a 100644
--- a/cpp/src/IceStorm/InstrumentationI.cpp
+++ b/cpp/src/IceStorm/InstrumentationI.cpp
@@ -94,7 +94,7 @@ public:
     };
     static Attributes attributes;
     
-    SubscriberHelper(const string& svc, const string& topic, const Ice::ObjectPrx& proxy, const IceStorm::QoS& qos, 
+    SubscriberHelper(const string& svc, const string& topic, const ::Ice::ObjectPrx& proxy, const IceStorm::QoS& qos, 
                      const IceStorm::TopicPrx& link, SubscriberState state) :
         _service(svc), _topic(topic), _proxy(proxy), _qos(qos), _link(link), _state(state)
     {
@@ -172,7 +172,7 @@ public:
             {
                 _id = _proxy->ice_toString();
             }
-            catch(const Ice::FixedProxyException&)
+            catch(const ::Ice::FixedProxyException&)
             {
                 _id = _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity());
             }
@@ -180,7 +180,7 @@ public:
         return _id;
     }
 
-    const Ice::ObjectPrx&
+    const ::Ice::ObjectPrx&
     getProxy() const
     {
         return _proxy;
@@ -213,7 +213,7 @@ private:
 
     const string& _service;
     const string& _topic;
-    const Ice::ObjectPrx& _proxy;
+    const ::Ice::ObjectPrx& _proxy;
     const IceStorm::QoS& _qos;
     const IceStorm::TopicPrx _link;
     const SubscriberState _state;
@@ -343,7 +343,7 @@ TopicManagerObserverI::getTopicObserver(const string& service, const string& top
         }
         catch(const exception& ex)
         {
-            Ice::Error error(_metrics->getLogger());
+            ::Ice::Error error(_metrics->getLogger());
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
@@ -353,7 +353,7 @@ TopicManagerObserverI::getTopicObserver(const string& service, const string& top
 SubscriberObserverPtr
 TopicManagerObserverI::getSubscriberObserver(const string& svc, 
                                              const string& topic, 
-                                             const Ice::ObjectPrx& proxy, 
+                                             const ::Ice::ObjectPrx& proxy, 
                                              const IceStorm::QoS& qos,
                                              const IceStorm::TopicPrx& link,
                                              SubscriberState state,
@@ -367,7 +367,7 @@ TopicManagerObserverI::getSubscriberObserver(const string& svc,
         }
         catch(const exception& ex)
         {
-            Ice::Error error(_metrics->getLogger());
+            ::Ice::Error error(_metrics->getLogger());
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }