zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/Ice/Instance.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -15,7 +15,7 @@
 #include <IceUtil/Mutex.h>
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/Timer.h>
-#include <IceUtil/StringConverter.h>
+#include <Ice/StringConverter.h>
 #include <Ice/InstanceF.h>
 #include <Ice/CommunicatorF.h>
 #include <Ice/InstrumentationF.h>
@@ -28,7 +28,7 @@
 #include <Ice/ThreadPoolF.h>
 #include <Ice/ConnectionFactoryF.h>
 #include <Ice/ACM.h>
-#include <Ice/ObjectFactoryManagerF.h>
+#include <Ice/ObjectFactory.h>
 #include <Ice/ObjectAdapterFactoryF.h>
 #include <Ice/EndpointFactoryManagerF.h>
 #include <Ice/IPEndpointIF.h>
@@ -42,7 +42,6 @@
 #include <Ice/FacetMap.h>
 #include <Ice/Process.h>
 #include <list>
-#include <IceUtil/UniquePtr.h>
 
 namespace Ice
 {
@@ -58,7 +57,7 @@ class Timer;
 typedef IceUtil::Handle<Timer> TimerPtr;
 
 class MetricsAdminI;
-typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr;
+ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI);
 
 class RequestHandlerFactory;
 typedef IceUtil::Handle<RequestHandlerFactory> RequestHandlerFactoryPtr;
@@ -95,7 +94,6 @@ public:
     RequestHandlerFactoryPtr requestHandlerFactory() const;
     ProxyFactoryPtr proxyFactory() const;
     OutgoingConnectionFactoryPtr outgoingConnectionFactory() const;
-    ObjectFactoryManagerPtr servantFactoryManager() const;
     ObjectAdapterFactoryPtr objectAdapterFactory() const;
     ProtocolSupport protocolSupport() const;
     bool preferIPv6() const;
@@ -112,13 +110,12 @@ public:
     size_t batchAutoFlushSize() const { return _batchAutoFlushSize; }
     size_t classGraphDepthMax() const { return _classGraphDepthMax; }
     bool collectObjects() const { return _collectObjects; }
+    Ice::ToStringMode toStringMode() const { return _toStringMode; }
     const ACMConfig& clientACM() const;
     const ACMConfig& serverACM() const;
-    Ice::Identity stringToIdentity(const std::string&) const;
-    std::string identityToString(const Ice::Identity&) const;
 
-    Ice::ObjectPrx createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
-    Ice::ObjectPrx getAdmin();
+    Ice::ObjectPrxPtr createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
+    Ice::ObjectPrxPtr getAdmin();
     void addAdminFacet(const Ice::ObjectPtr&, const std::string&);
     Ice::ObjectPtr removeAdminFacet(const std::string&);
     Ice::ObjectPtr findAdminFacet(const std::string&);
@@ -129,24 +126,33 @@ public:
         return _implicitContext;
     }
 
-    void setDefaultLocator(const Ice::LocatorPrx&);
-    void setDefaultRouter(const Ice::RouterPrx&);
+    void setDefaultLocator(const Ice::LocatorPrxPtr&);
+    void setDefaultRouter(const Ice::RouterPrxPtr&);
 
     void setLogger(const Ice::LoggerPtr&);
+#ifdef ICE_CPP11_MAPPING
+    void setThreadHook(std::function<void()>, std::function<void()>);
+#else
     void setThreadHook(const Ice::ThreadNotificationPtr&);
+#endif
 
-    IceUtil::StringConverterPtr getStringConverter() const { return _stringConverter; }
-    IceUtil::WstringConverterPtr getWstringConverter() const { return _wstringConverter; }
+    const Ice::StringConverterPtr& getStringConverter() const { return _stringConverter; }
+    const Ice::WstringConverterPtr& getWstringConverter() const { return _wstringConverter; }
 
     BufSizeWarnInfo getBufSizeWarn(Ice::Short type);
     void setSndBufSizeWarn(Ice::Short type, int size);
     void setRcvBufSizeWarn(Ice::Short type, int size);
 
+    void addObjectFactory(const Ice::ObjectFactoryPtr&, const std::string&);
+    Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const;
+
+    typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap;
+
 private:
 
     Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&);
     virtual ~Instance();
-    void finishSetup(int&, char*[], const Ice::CommunicatorPtr&);
+    void finishSetup(int&, const char*[], const Ice::CommunicatorPtr&);
     void destroy();
     friend class Ice::CommunicatorI;
 
@@ -173,6 +179,7 @@ private:
     const size_t _batchAutoFlushSize; // Immutable, not reset by destroy().
     const size_t _classGraphDepthMax; // Immutable, not reset by destroy().
     const bool _collectObjects; // Immutable, not reset by destroy().
+    const Ice::ToStringMode _toStringMode; // Immutable, not reset by destroy()
     ACMConfig _clientACM;
     ACMConfig _serverACM;
     RouterManagerPtr _routerManager;
@@ -181,7 +188,6 @@ private:
     RequestHandlerFactoryPtr _requestHandlerFactory;
     ProxyFactoryPtr _proxyFactory;
     OutgoingConnectionFactoryPtr _outgoingConnectionFactory;
-    ObjectFactoryManagerPtr _servantFactoryManager;
     ObjectAdapterFactoryPtr _objectAdapterFactory;
     ProtocolSupport _protocolSupport;
     bool _preferIPv6;
@@ -195,8 +201,8 @@ private:
     DynamicLibraryListPtr _dynamicLibraryList;
     Ice::PluginManagerPtr _pluginManager;
     const Ice::ImplicitContextIPtr _implicitContext;
-    IceUtil::StringConverterPtr _stringConverter;
-    IceUtil::WstringConverterPtr _wstringConverter;
+    Ice::StringConverterPtr _stringConverter;
+    Ice::WstringConverterPtr _wstringConverter;
     bool _adminEnabled;
     Ice::ObjectAdapterPtr _adminAdapter;
     Ice::FacetMap _adminFacets;
@@ -205,6 +211,8 @@ private:
     IceInternal::MetricsAdminIPtr _metricsAdmin;
     std::map<Ice::Short, BufSizeWarnInfo> _setBufSizeWarn;
     IceUtil::Mutex _setBufSizeWarnMutex;
+    ObjectFactoryMap _objectFactoryMap;
+    mutable ObjectFactoryMap::iterator _objectFactoryMapHint;
 };
 
 class ProcessI : public Ice::Process
@@ -214,7 +222,11 @@ public:
     ProcessI(const Ice::CommunicatorPtr&);
 
     virtual void shutdown(const Ice::Current&);
+#ifdef ICE_CPP11_MAPPING
+    virtual void writeMessage(std::string, Ice::Int, const Ice::Current&);
+#else
     virtual void writeMessage(const std::string&, Ice::Int, const Ice::Current&);
+#endif
 
 private:
 

data/ext/ice/cpp/src/Ice/Instrumentation.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,22 +23,79 @@
 #endif
 #include <Ice/Instrumentation.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace
+{
+
+}
+
+Ice::Instrumentation::Observer::~Observer()
+{
+}
+
+Ice::Instrumentation::ThreadObserver::~ThreadObserver()
+{
+}
+
+Ice::Instrumentation::ConnectionObserver::~ConnectionObserver()
+{
+}
+
+Ice::Instrumentation::DispatchObserver::~DispatchObserver()
+{
+}
+
+Ice::Instrumentation::ChildInvocationObserver::~ChildInvocationObserver()
+{
+}
+
+Ice::Instrumentation::RemoteObserver::~RemoteObserver()
+{
+}
+
+Ice::Instrumentation::CollocatedObserver::~CollocatedObserver()
+{
+}
+
+Ice::Instrumentation::InvocationObserver::~InvocationObserver()
+{
+}
+
+Ice::Instrumentation::ObserverUpdater::~ObserverUpdater()
+{
+}
+
+Ice::Instrumentation::CommunicatorObserver::~CommunicatorObserver()
+{
+}
+
+#else // C++98 mapping
+
 namespace
 {
 
@@ -49,26 +106,68 @@ namespace
 
 }
 
-namespace Ice
+Ice::Instrumentation::Observer::~Observer()
 {
 }
 
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::Observer* p) { return p; }
 
+Ice::Instrumentation::ThreadObserver::~ThreadObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ThreadObserver* p) { return p; }
 
+Ice::Instrumentation::ConnectionObserver::~ConnectionObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ConnectionObserver* p) { return p; }
 
+Ice::Instrumentation::DispatchObserver::~DispatchObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::DispatchObserver* p) { return p; }
 
+Ice::Instrumentation::ChildInvocationObserver::~ChildInvocationObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ChildInvocationObserver* p) { return p; }
 
+Ice::Instrumentation::RemoteObserver::~RemoteObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::RemoteObserver* p) { return p; }
 
+Ice::Instrumentation::CollocatedObserver::~CollocatedObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::CollocatedObserver* p) { return p; }
 
+Ice::Instrumentation::InvocationObserver::~InvocationObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::InvocationObserver* p) { return p; }
 
+Ice::Instrumentation::ObserverUpdater::~ObserverUpdater()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ObserverUpdater* p) { return p; }
 
+Ice::Instrumentation::CommunicatorObserver::~CommunicatorObserver()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::CommunicatorObserver* p) { return p; }
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/InstrumentationF.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,21 +23,37 @@
 #endif
 #include <Ice/InstrumentationF.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <IceUtil/Iterator.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace
+{
+
+}
+
+#else // C++98 mapping
+
 namespace
 {
 
@@ -47,3 +63,9 @@ namespace
 }
 
 }
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/InstrumentationI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -22,7 +22,13 @@ using namespace IceInternal;
 using namespace Ice::Instrumentation;
 using namespace IceMX;
 
-namespace 
+#ifdef ICE_CPP11_MAPPING
+#  define ICE_OBJECT_PRX Ice::ObjectPrx
+#else
+#  define ICE_OBJECT_PRX IceProxy::Ice::Object
+#endif
+
+namespace
 {
 
 int ThreadMetrics::*
@@ -30,33 +36,33 @@ getThreadStateMetric(ThreadState s)
 {
     switch(s)
     {
-    case ThreadStateIdle:
-        return 0;
-    case ThreadStateInUseForIO:
-        return &ThreadMetrics::inUseForIO;
-    case ThreadStateInUseForUser:
-        return &ThreadMetrics::inUseForUser;
-    case ThreadStateInUseForOther:
-        return &ThreadMetrics::inUseForOther;
-    default:
-        assert(false);
-        return 0;
+        case ICE_ENUM(ThreadState, ThreadStateIdle):
+            return 0;
+        case ICE_ENUM(ThreadState, ThreadStateInUseForIO):
+            return &ThreadMetrics::inUseForIO;
+        case ICE_ENUM(ThreadState, ThreadStateInUseForUser):
+            return &ThreadMetrics::inUseForUser;
+        case ICE_ENUM(ThreadState, ThreadStateInUseForOther):
+            return &ThreadMetrics::inUseForOther;
+        default:
+            assert(false);
+            return 0;
     }
-}    
+}
 
-struct ThreadStateChanged 
+struct ThreadStateChanged
 {
     ThreadStateChanged(ThreadState oldState, ThreadState newState) : oldState(oldState), newState(newState)
     {
     }
-    
+
     void operator()(const ThreadMetricsPtr& v)
     {
-        if(oldState != ThreadStateIdle)
+        if(oldState != ICE_ENUM(ThreadState, ThreadStateIdle))
         {
             --(v.get()->*getThreadStateMetric(oldState));
         }
-        if(newState != ThreadStateIdle)
+        if(newState != ICE_ENUM(ThreadState, ThreadStateIdle))
         {
             ++(v.get()->*getThreadStateMetric(newState));
         }
@@ -66,6 +72,20 @@ struct ThreadStateChanged
     ThreadState newState;
 };
 
+IPConnectionInfo*
+getIPConnectionInfo(const ConnectionInfoPtr& info)
+{
+    for(ConnectionInfoPtr p = info; p; p = p->underlying)
+    {
+        IPConnectionInfo* ipInfo = dynamic_cast<IPConnectionInfo*>(p.get());
+        if(ipInfo)
+        {
+            return ipInfo;
+        }
+    }
+    return ICE_NULLPTR;
+}
+
 class ConnectionHelper : public MetricsHelperT<ConnectionMetrics>
 {
 public:
@@ -73,7 +93,7 @@ public:
     class Attributes : public AttributeResolverT<ConnectionHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &ConnectionHelper::getParent);
@@ -83,8 +103,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) : 
+
+    ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) :
         _connectionInfo(con), _endpoint(endpt), _state(state)
     {
     }
@@ -100,7 +120,7 @@ public:
         if(_id.empty())
         {
             ostringstream os;
-            IPConnectionInfoPtr info = IPConnectionInfoPtr::dynamicCast(_connectionInfo);
+            IPConnectionInfo* info = getIPConnectionInfo(_connectionInfo);
             if(info)
             {
                 os << info->localAddress << ':' << info->localPort;
@@ -125,23 +145,23 @@ public:
     {
         switch(_state)
         {
-        case ConnectionStateValidating:
-            return "validating";
-        case ConnectionStateHolding:
-            return "holding";
-        case ConnectionStateActive:
-            return "active";
-        case ConnectionStateClosing:
-            return "closing";
-        case ConnectionStateClosed:
-            return "closed";
-        default:
-            assert(false);
-            return "";
+            case ICE_ENUM(ConnectionState, ConnectionStateValidating):
+                return "validating";
+            case ICE_ENUM(ConnectionState, ConnectionStateHolding):
+                return "holding";
+            case ICE_ENUM(ConnectionState, ConnectionStateActive):
+                return "active";
+            case ICE_ENUM(ConnectionState, ConnectionStateClosing):
+                return "closing";
+            case ICE_ENUM(ConnectionState, ConnectionStateClosed):
+                return "closed";
+            default:
+                assert(false);
+                return "";
         }
     }
-    
-    string 
+
+    string
     getParent() const
     {
         if(!_connectionInfo->adapterName.empty())
@@ -153,7 +173,7 @@ public:
             return "Communicator";
         }
     }
-    
+
     const ConnectionInfoPtr&
     getConnectionInfo() const
     {
@@ -175,7 +195,7 @@ public:
         }
         return _endpointInfo;
     }
-    
+
 private:
 
     const ConnectionInfoPtr& _connectionInfo;
@@ -194,7 +214,7 @@ public:
     class Attributes : public AttributeResolverT<DispatchHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &DispatchHelper::getParent);
@@ -213,7 +233,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     DispatchHelper(const Current& current, int size) : _current(current), _size(size)
     {
     }
@@ -263,7 +283,7 @@ public:
         return _id;
     }
 
-    string 
+    string
     getParent() const
     {
         return _current.adapter->getName();
@@ -334,7 +354,7 @@ public:
     class Attributes : public AttributeResolverT<InvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &InvocationHelper::getParent);
@@ -342,8 +362,8 @@ public:
 
             add("operation", &InvocationHelper::getOperation);
             add("identity", &InvocationHelper::getIdentity);
-            add("facet", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getFacet);
-            add("encoding", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getEncodingVersion);
+            add("facet", &InvocationHelper::getProxy, &ICE_OBJECT_PRX::ice_getFacet);
+            add("encoding", &InvocationHelper::getProxy, &ICE_OBJECT_PRX::ice_getEncodingVersion);
             add("mode", &InvocationHelper::getMode);
             add("proxy", &InvocationHelper::getProxy);
 
@@ -351,8 +371,7 @@ public:
         }
     };
     static Attributes attributes;
-    
-    InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx) :
+    InvocationHelper(const ObjectPrxPtr& proxy, const string& op, const Context& ctx) :
         _proxy(proxy), _operation(op), _context(ctx)
     {
     }
@@ -386,23 +405,23 @@ public:
         if(_proxy->ice_isTwoway())
         {
             return "twoway";
-        } 
+        }
         else if(_proxy->ice_isOneway())
         {
             return "oneway";
-        } 
+        }
         else if(_proxy->ice_isBatchOneway())
         {
             return "batch-oneway";
-        } 
+        }
         else if(_proxy->ice_isDatagram())
         {
             return "datagram";
-        } 
+        }
         else if(_proxy->ice_isBatchDatagram())
         {
             return "batch-datagram";
-        } 
+        }
         else
         {
             throw invalid_argument("mode");
@@ -419,7 +438,7 @@ public:
             {
                 try
                 {
-                    os << _proxy->ice_endpoints(Ice::EndpointSeq()) << " [" << _operation << ']';
+                    os << _proxy->ice_endpoints(Ice::EndpointSeq())->ice_toString() << " [" << _operation << ']';
                 }
                 catch(const Exception&)
                 {
@@ -437,19 +456,18 @@ public:
         return _id;
     }
 
-    string 
+    string
     getParent() const
     {
         return "Communicator";
     }
 
-    const ObjectPrx&
+    const ObjectPrxPtr&
     getProxy() const
     {
         return _proxy;
     }
 
-
     string
     getIdentity() const
     {
@@ -471,7 +489,7 @@ public:
 
 private:
 
-    const ObjectPrx& _proxy;
+    const ObjectPrxPtr& _proxy;
     const string& _operation;
     const Context& _context;
     mutable string _id;
@@ -486,7 +504,7 @@ public:
     class Attributes : public AttributeResolverT<RemoteInvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &RemoteInvocationHelper::getParent);
@@ -496,8 +514,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) : 
+
+    RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) :
         _connectionInfo(con), _endpoint(endpt), _requestId(requestId), _size(size)
     {
     }
@@ -525,8 +543,8 @@ public:
         }
         return _id;
     }
-    
-    string 
+
+    string
     getParent() const
     {
         if(!_connectionInfo->adapterName.empty())
@@ -538,7 +556,7 @@ public:
             return "Communicator";
         }
     }
-    
+
     const ConnectionInfoPtr&
     getConnectionInfo() const
     {
@@ -560,7 +578,7 @@ public:
         }
         return _endpointInfo;
     }
-    
+
 private:
 
     const ConnectionInfoPtr& _connectionInfo;
@@ -588,7 +606,7 @@ public:
     class Attributes : public AttributeResolverT<CollocatedInvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &CollocatedInvocationHelper::getParent);
@@ -597,8 +615,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) : 
+
+    CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) :
         _requestId(requestId), _size(size), _id(adapter->getName())
     {
     }
@@ -618,8 +636,8 @@ public:
     {
         return _id;
     }
-    
-    string 
+
+    string
     getParent() const
     {
         return "Communicator";
@@ -647,7 +665,7 @@ public:
     class Attributes : public AttributeResolverT<ThreadHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &ThreadHelper::_parent);
@@ -655,7 +673,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     ThreadHelper(const string& parent, const string& id, ThreadState state) : _parent(parent), _id(id), _state(state)
     {
     }
@@ -667,14 +685,14 @@ public:
 
     virtual void initMetrics(const ThreadMetricsPtr& v) const
     {
-        if(_state != ThreadStateIdle)
+        if(_state != ICE_ENUM(ThreadState, ThreadStateIdle))
         {
             ++(v.get()->*getThreadStateMetric(_state));
         }
     }
 
 private:
-    
+
     const string _parent;
     const string _id;
     const ThreadState _state;
@@ -689,7 +707,7 @@ public:
     class Attributes : public AttributeResolverT<EndpointHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &EndpointHelper::getParent);
@@ -698,7 +716,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     EndpointHelper(const EndpointPtr& endpt, const string& id) : _endpoint(endpt), _id(id)
     {
     }
@@ -745,7 +763,7 @@ public:
     }
 
 private:
-    
+
     const EndpointPtr _endpoint;
     mutable string _id;
     mutable EndpointInfoPtr _endpointInfo;
@@ -755,7 +773,7 @@ EndpointHelper::Attributes EndpointHelper::attributes;
 
 }
 
-void 
+void
 ConnectionObserverI::sentBytes(Int num)
 {
     forEach(add(&ConnectionMetrics::sentBytes, num));
@@ -765,7 +783,7 @@ ConnectionObserverI::sentBytes(Int num)
     }
 }
 
-void 
+void
 ConnectionObserverI::receivedBytes(Int num)
 {
     forEach(add(&ConnectionMetrics::receivedBytes, num));
@@ -847,8 +865,8 @@ InvocationObserverI::userException()
 }
 
 RemoteObserverPtr
-InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, 
-                                       const EndpointPtr& endpoint, 
+InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
+                                       const EndpointPtr& endpoint,
                                        int requestId,
                                        int size)
 {
@@ -859,14 +877,14 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
         {
             delegate = _delegate->getRemoteObserver(connection, endpoint, requestId, size);
         }
-        return getObserverWithDelegate<RemoteObserverI>("Remote", 
+        return getObserverWithDelegate<RemoteObserverI>("Remote",
                                                         RemoteInvocationHelper(connection, endpoint, requestId, size),
                                                         delegate);
     }
     catch(const exception&)
     {
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
 CollocatedObserverPtr
@@ -886,10 +904,10 @@ InvocationObserverI::getCollocatedObserver(const Ice::ObjectAdapterPtr& adapter,
     catch(const exception&)
     {
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) : 
+CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) :
     _metrics(new MetricsAdminI(initData.properties, initData.logger)),
     _delegate(initData.observer),
     _connections(_metrics, "Connection"),
@@ -934,7 +952,7 @@ CommunicatorObserverI::getConnectionEstablishmentObserver(const EndpointPtr& end
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
 ObserverPtr
@@ -957,13 +975,13 @@ CommunicatorObserverI::getEndpointLookupObserver(const EndpointPtr& endpt)
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-ConnectionObserverPtr 
-CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con, 
+ConnectionObserverPtr
+CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
                                              const EndpointPtr& endpt,
-                                             ConnectionState state, 
+                                             ConnectionState state,
                                              const ConnectionObserverPtr& observer)
 {
     if(_connections.isEnabled())
@@ -984,11 +1002,11 @@ CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-ThreadObserverPtr 
-CommunicatorObserverI::getThreadObserver(const string& parent, 
+ThreadObserverPtr
+CommunicatorObserverI::getThreadObserver(const string& parent,
                                          const string& id,
                                          ThreadState state,
                                          const ThreadObserverPtr& observer)
@@ -1011,11 +1029,11 @@ CommunicatorObserverI::getThreadObserver(const string& parent,
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-InvocationObserverPtr 
-CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const string& op, const Context& ctx)
+InvocationObserverPtr
+CommunicatorObserverI::getInvocationObserver(const ObjectPrxPtr& proxy, const string& op, const Context& ctx)
 {
     if(_invocations.isEnabled())
     {
@@ -1034,10 +1052,10 @@ CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const strin
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-DispatchObserverPtr 
+DispatchObserverPtr
 CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
 {
     if(_dispatch.isEnabled())
@@ -1057,10 +1075,10 @@ CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-const IceInternal::MetricsAdminIPtr& 
+const IceInternal::MetricsAdminIPtr&
 CommunicatorObserverI::getFacet() const
 {
     assert(_metrics);