Fix for Solaris build failure

2 files changed, 14 insertions, 14 deletions

diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index fcfae4200a7..3f7b657ea1e 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -784,9 +784,9 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
         {
             delegate = _delegate->getRemoteObserver(connection, endpoint, requestId, size);
         }
-        return getObserver<RemoteObserverI>("Remote", 
-                                            RemoteInvocationHelper(connection, endpoint, requestId, size),
-                                            delegate);
+        return getObserverWithDelegate<RemoteObserverI>("Remote", 
+                                                        RemoteInvocationHelper(connection, endpoint, requestId, size),
+                                                        delegate);
     }
     catch(const exception&)
     {
@@ -832,7 +832,7 @@ CommunicatorObserverI::getConnectionEstablishmentObserver(const EndpointPtr& end
             {
                 delegate = _delegate->getConnectionEstablishmentObserver(endpt, connector);
             }
-            return _connects.getObserver(EndpointHelper(endpt, connector), delegate);
+            return _connects.getObserverWithDelegate(EndpointHelper(endpt, connector), delegate);
         }
         catch(const exception& ex)
         {
@@ -855,7 +855,7 @@ CommunicatorObserverI::getEndpointLookupObserver(const EndpointPtr& endpt)
             {
                 delegate = _delegate->getEndpointLookupObserver(endpt);
             }
-            return _endpointLookups.getObserver(EndpointHelper(endpt), delegate);
+            return _endpointLookups.getObserverWithDelegate(EndpointHelper(endpt), delegate);
         }
         catch(const exception& ex)
         {
@@ -882,7 +882,7 @@ CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
             {
                 delegate = _delegate->getConnectionObserver(con, endpt, state, o ? o->getDelegate() : observer);
             }
-            return _connections.getObserver(ConnectionHelper(con, endpt, state), delegate, observer);
+            return _connections.getObserverWithDelegate(ConnectionHelper(con, endpt, state), delegate, observer);
         }
         catch(const exception& ex)
         {
@@ -909,7 +909,7 @@ CommunicatorObserverI::getThreadObserver(const string& parent,
             {
                 delegate = _delegate->getThreadObserver(parent, id, state, o ? o->getDelegate() : observer);
             }
-            return _threads.getObserver(ThreadHelper(parent, id, state), delegate, observer);
+            return _threads.getObserverWithDelegate(ThreadHelper(parent, id, state), delegate, observer);
         }
         catch(const exception& ex)
         {
@@ -932,7 +932,7 @@ CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const strin
             {
                 delegate = _delegate->getInvocationObserver(proxy, op, ctx);
             }
-            return _invocations.getObserver(InvocationHelper(proxy, op, ctx), delegate);
+            return _invocations.getObserverWithDelegate(InvocationHelper(proxy, op, ctx), delegate);
         }
         catch(const exception& ex)
         {
@@ -955,7 +955,7 @@ CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
             {
                 delegate = _delegate->getDispatchObserver(current, size);
             }
-            return _dispatch.getObserver(DispatchHelper(current, size), delegate);
+            return _dispatch.getObserverWithDelegate(DispatchHelper(current, size), delegate);
         }
         catch(const exception& ex)
         {
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 1db093feae2..944dd7f4f6d 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -66,8 +66,8 @@ public:
     }
 
     template<typename ObserverImpl, typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
-    getObserver(const std::string& mapName, const IceMX::MetricsHelperT<ObserverMetricsType>& helper, 
-                const ObserverPtrType& del)
+    getObserverWithDelegate(const std::string& mapName, const IceMX::MetricsHelperT<ObserverMetricsType>& helper, 
+                            const ObserverPtrType& del)
     {
         IceInternal::Handle<ObserverImpl> obsv = IceMX::ObserverT<T>::template getObserver<ObserverImpl>(mapName, 
                                                                                                          helper);
@@ -94,7 +94,7 @@ public:
     }
 
     template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
-    getObserver(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del)
+    getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del)
     {
         IceInternal::Handle<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper);
         if(obsv)
@@ -106,8 +106,8 @@ public:
     }
 
     template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
-    getObserver(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del, 
-                const ObserverPtrType& old)
+    getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del, 
+                            const ObserverPtrType& old)
     {
         IceInternal::Handle<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper, old);
         if(obsv)