zeroc-ice 3.6.5 → 3.7.4

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_REFERENCE_H
 #define ICE_REFERENCE_H
@@ -27,23 +22,31 @@
 #include <Ice/Protocol.h>
 #include <Ice/Properties.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+
+}
+
+namespace IceInternal
+{
 
 class Reference : public IceUtil::Shared
 {
 public:
 
-    class GetConnectionCallback : virtual public IceUtil::Shared
+    class GetConnectionCallback
+#ifndef ICE_CPP11_MAPPING
+        : public virtual IceUtil::Shared
+#endif
     {
     public:
 
         virtual void setConnection(const Ice::ConnectionIPtr&, bool) = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
-    typedef IceUtil::Handle<GetConnectionCallback> GetConnectionCallbackPtr;
+    ICE_DEFINE_PTR(GetConnectionCallbackPtr, GetConnectionCallback);
 
     enum Mode
     {
@@ -64,10 +67,13 @@ public:
     const InstancePtr& getInstance() const { return _instance; }
     const SharedContextPtr& getContext() const { return _context; }
     int getInvocationTimeout() const { return _invocationTimeout; }
+    IceUtil::Optional<bool> getCompress() const
+    {
+        return _overrideCompress ? IceUtil::Optional<bool>(_compress) : IceUtil::None;
+    }
 
     Ice::CommunicatorPtr getCommunicator() const;
 
-
     virtual std::vector<EndpointIPtr> getEndpoints() const = 0;
     virtual std::string getAdapterId() const = 0;
     virtual LocatorInfoPtr getLocatorInfo() const { return 0; }
@@ -78,6 +84,7 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const = 0;
     virtual int getLocatorCacheTimeout() const = 0;
     virtual std::string getConnectionId() const = 0;
+    virtual IceUtil::Optional<int> getTimeout() const = 0;
 
     //
     // The change* methods (here and in derived classes) create
@@ -95,8 +102,8 @@ public:
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const = 0;
     virtual ReferencePtr changeAdapterId(const std::string&) const = 0;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const = 0;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const = 0;
     virtual ReferencePtr changeCollocationOptimized(bool) const = 0;
     virtual ReferencePtr changeLocatorCacheTimeout(int) const = 0;
     virtual ReferencePtr changeCacheConnection(bool) const = 0;
@@ -105,9 +112,12 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const = 0;
     virtual ReferencePtr changeConnectionId(const std::string&) const = 0;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const = 0;
 
     int hash() const; // Conceptually const.
 
+    bool getCompressOverride(bool&) const;
+
     //
     // Utility methods.
     //
@@ -117,7 +127,7 @@ public:
     //
     // Marshal the reference.
     //
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
 
     //
     // Convert the reference to its string form.
@@ -132,11 +142,10 @@ public:
     //
     // Get a suitable connection for this reference.
     //
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const = 0;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const = 0;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const = 0;
@@ -177,7 +186,8 @@ class FixedReference : public Reference
 public:
 
     FixedReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode,
-                   bool, const Ice::EncodingVersion&, const Ice::ConnectionIPtr&);
+                   bool, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const Ice::ConnectionIPtr&,
+                   int, const Ice::Context&, const IceUtil::Optional<bool>&);
 
     virtual std::vector<EndpointIPtr> getEndpoints() const;
     virtual std::string getAdapterId() const;
@@ -187,11 +197,12 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const;
     virtual int getLocatorCacheTimeout() const;
     virtual std::string getConnectionId() const;
+    virtual IceUtil::Optional<int> getTimeout() const;
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -200,19 +211,18 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const;
     virtual ReferencePtr changeConnectionId(const std::string&) const;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const;
 
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
 
-    virtual void streamWrite(BasicStream*) const;
-    virtual std::string toString() const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const;
@@ -243,13 +253,14 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const;
     virtual int getLocatorCacheTimeout() const;
     virtual std::string getConnectionId() const;
+    virtual IceUtil::Optional<int> getTimeout() const;
 
     virtual ReferencePtr changeEncoding(const Ice::EncodingVersion&) const;
     virtual ReferencePtr changeCompress(bool) const;
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -258,21 +269,21 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const;
     virtual ReferencePtr changeConnectionId(const std::string&) const;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const;
 
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
 
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual std::string toString() const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     void getConnection(const GetConnectionCallbackPtr&) const;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/ReferenceFactory.h>
@@ -20,11 +15,11 @@
 #include <Ice/LocatorInfo.h>
 #include <Ice/Locator.h>
 #include <Ice/LoggerUtil.h>
-#include <Ice/BasicStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Properties.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/PropertyNames.h>
-#include <IceUtil/StringUtil.h>
+#include <Ice/StringUtil.h>
 
 using namespace std;
 using namespace Ice;
@@ -91,8 +86,12 @@ IceInternal::ReferenceFactory::create(const Identity& ident, const Ice::Connecti
                               "",  // Facet
                               connection->endpoint()->datagram() ? Reference::ModeDatagram : Reference::ModeTwoway,
                               connection->endpoint()->secure(),
+                              Ice::Protocol_1_0,
                               _instance->defaultsAndOverrides()->defaultEncoding,
-                              connection);
+                              connection,
+                              -1,
+                              Ice::Context(),
+                              IceUtil::Optional<bool>());
 }
 
 ReferencePtr
@@ -112,9 +111,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
     beg = s.find_first_not_of(delim, end);
     if(beg == string::npos)
     {
-        ProxyParseException ex(__FILE__, __LINE__);
-        ex.str = "no non-whitespace characters found in `" + s + "'";
-        throw ex;
+        throw ProxyParseException(__FILE__, __LINE__, "no non-whitespace characters found in `" + s + "'");
     }
 
     //
@@ -125,9 +122,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
     end = IceUtilInternal::checkQuote(s, beg);
     if(end == string::npos)
     {
-        ProxyParseException ex(__FILE__, __LINE__);
-        ex.str = "mismatched quotes around identity in `" + s + "'";
-        throw ex;
+        throw ProxyParseException(__FILE__, __LINE__, "mismatched quotes around identity in `" + s + "'");
     }
     else if(end == 0)
     {
@@ -147,15 +142,14 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 
     if(beg == end)
     {
-        ProxyParseException ex(__FILE__, __LINE__);
-        ex.str = "no identity in `" + s + "'";
-        throw ex;
+        throw ProxyParseException(__FILE__, __LINE__, "no identity in `" + s + "'");
     }
 
     //
     // Parsing the identity may raise IdentityParseException.
     //
-    Identity ident = _instance->stringToIdentity(idstr);
+    Identity ident = Ice::stringToIdentity(idstr);
+
     if(ident.name.empty())
     {
         //
@@ -164,9 +158,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
         //
         if(!ident.category.empty())
         {
-            IllegalIdentityException e(__FILE__, __LINE__);
-            e.id = ident;
-            throw e;
+            throw IllegalIdentityException(__FILE__, __LINE__, ident);
         }
         //
         // Treat a stringified proxy containing two double
@@ -176,9 +168,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
         //
         else if(s.find_first_not_of(delim, end) != string::npos)
         {
-            ProxyParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid characters after identity in `" + s + "'";
-            throw ex;
+            throw ProxyParseException(__FILE__, __LINE__, "invalid characters after identity in `" + s + "'");
         }
         else
         {
@@ -220,9 +210,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
         string option = s.substr(beg, end - beg);
         if(option.length() != 2 || option[0] != '-')
         {
-            ProxyParseException ex(__FILE__, __LINE__);
-            ex.str = "expected a proxy option but found `" + option + "' in `" + s + "'";
-            throw ex;
+            throw ProxyParseException(__FILE__, __LINE__, "expected a proxy option but found `" + option + "' in `" +
+                                      s + "'");
         }
 
         //
@@ -240,9 +229,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
                 end = IceUtilInternal::checkQuote(s, beg);
                 if(end == string::npos)
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "mismatched quotes around value for " + option + " option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "mismatched quotes around value for " + option +
+                                              " option in `" + s + "'");
                 }
                 else if(end == 0)
                 {
@@ -272,23 +260,18 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "no argument provided for -f option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "no argument provided for -f option in `" + s + "'");
                 }
 
                 try
                 {
-                    facet = IceUtilInternal::unescapeString(argument, 0, argument.size());
+                    facet = unescapeString(argument, 0, argument.size(), "");
                 }
-                catch(const IceUtil::IllegalArgumentException& e)
+                catch(const IceUtil::IllegalArgumentException& ex)
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "invalid facet in `" + s + "': " + e.reason();
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "invalid facet in `" + s + "': " + ex.reason());
                 }
 
-                facet = UTF8ToNative(facet, _instance->getStringConverter());
                 break;
             }
 
@@ -296,9 +279,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -t option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -t option in `" + s + "'");
                 }
                 mode = Reference::ModeTwoway;
                 break;
@@ -308,9 +290,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -o option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -o option in `" + s + "'");
                 }
                 mode = Reference::ModeOneway;
                 break;
@@ -320,9 +301,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -O option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -O option in `" + s + "'");
                 }
                 mode = Reference::ModeBatchOneway;
                 break;
@@ -332,9 +312,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -d option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -d option in `" + s + "'");
                 }
                 mode = Reference::ModeDatagram;
                 break;
@@ -344,9 +323,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -D option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -D option in `" + s + "'");
                 }
                 mode = Reference::ModeBatchDatagram;
                 break;
@@ -356,9 +334,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -s option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -s option in `" + s + "'");
                 }
                 secure = true;
                 break;
@@ -368,20 +345,17 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(argument.empty())
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "no argument provided for -e option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "no argument provided for -e option in `" + s + "'");
                 }
 
                 try
                 {
                     encoding = Ice::stringToEncodingVersion(argument);
                 }
-                catch(const Ice::VersionParseException& e)
+                catch(const Ice::VersionParseException& ex)
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "invalid encoding version `" + argument + "' in `" + s + "':\n" + e.str;
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "invalid encoding version `" + argument + "' in `" +
+                                              s + "':\n" + ex.str);
                 }
                 break;
             }
@@ -390,29 +364,24 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(argument.empty())
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "no argument provided for -p option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "no argument provided for -p option in `" + s + "'");
                 }
 
                 try
                 {
                     protocol = Ice::stringToProtocolVersion(argument);
                 }
-                catch(const Ice::VersionParseException& e)
+                catch(const Ice::VersionParseException& ex)
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "invalid protocol version `" + argument + "' in `" + s + "':\n" + e.str;
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "invalid protocol version `" + argument + "' in `" +
+                                              s + "':\n" + ex.str);
                 }
                 break;
             }
 
             default:
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "unknown option `" + option + "' in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "unknown option `" + option + "' in `" + s + "'");
             }
         }
     }
@@ -479,7 +448,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 
                 string es = s.substr(beg, end - beg);
                 EndpointIPtr endp = _instance->endpointFactoryManager()->create(es, false);
-                if(endp != 0)
+                if(endp != ICE_NULLPTR)
                 {
                     endpoints.push_back(endp);
                 }
@@ -491,9 +460,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             if(endpoints.size() == 0)
             {
                 assert(!unknownEndpoints.empty());
-                EndpointParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid endpoint `" + unknownEndpoints.front() + "' in `" + s + "'";
-                throw ex;
+                throw EndpointParseException(__FILE__, __LINE__, "invalid endpoint `" + unknownEndpoints.front() +
+                                             "' in `" + s + "'");
             }
             else if(unknownEndpoints.size() != 0 &&
                     _instance->initializationData().properties->
@@ -515,18 +483,14 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             beg = s.find_first_not_of(delim, beg + 1);
             if(beg == string::npos)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "missing adapter id in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "missing adapter id in `" + s + "'");
             }
 
             string adapterstr;
             end = IceUtilInternal::checkQuote(s, beg);
             if(end == string::npos)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "mismatched quotes around adapter id in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "mismatched quotes around adapter id in `" + s + "'");
             }
             else if(end == 0)
             {
@@ -547,46 +511,35 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             // Check for trailing whitespace.
             if(end != string::npos && s.find_first_not_of(delim, end) != string::npos)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid trailing characters after `" + s.substr(0, end + 1) + "' in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "invalid trailing characters after `" +
+                                          s.substr(0, end + 1) + "' in `" + s + "'");
             }
 
             try
             {
-                adapter = IceUtilInternal::unescapeString(adapterstr, 0, adapterstr.size());
+                adapter = unescapeString(adapterstr, 0, adapterstr.size(), "");
             }
-            catch(const IceUtil::IllegalArgumentException& e)
+            catch(const IceUtil::IllegalArgumentException& ex)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid adapter id in `" + s + "': " + e.reason();
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "invalid adapter id in `" + s + "': " + ex.reason());
             }
             if(adapter.size() == 0)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "empty adapter id in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "empty adapter id in `" + s + "'");
             }
 
-            adapter = UTF8ToNative(adapter, _instance->getStringConverter());
-
             return create(ident, facet, mode, secure, protocol, encoding, endpoints, adapter, propertyPrefix);
             break;
         }
         default:
         {
-            ProxyParseException ex(__FILE__, __LINE__);
-            ex.str = "malformed proxy `" + s + "'";
-            throw ex;
+            throw ProxyParseException(__FILE__, __LINE__, "malformed proxy `" + s + "'");
         }
     }
-
-    return 0; // Unreachable, prevents compiler warning.
 }
 
 ReferencePtr
-IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
+IceInternal::ReferenceFactory::create(const Identity& ident, InputStream* s)
 {
     //
     // Don't read the identity here. Operations calling this
@@ -626,7 +579,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 
     Ice::ProtocolVersion protocol;
     Ice::EncodingVersion encoding;
-    if(s->getReadEncoding() != Ice::Encoding_1_0)
+    if(s->getEncoding() != Ice::Encoding_1_0)
     {
         s->read(protocol);
         s->read(encoding);
@@ -644,7 +597,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 
     if(sz > 0)
     {
-        endpoints.reserve(sz);
+        endpoints.reserve(static_cast<size_t>(sz));
         while(sz--)
         {
             EndpointIPtr endpoint = _instance->endpointFactoryManager()->read(s);
@@ -660,7 +613,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
+IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrxPtr& defaultRouter)
 {
     if(defaultRouter == _defaultRouter)
     {
@@ -673,14 +626,14 @@ IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
     return factory;
 }
 
-RouterPrx
+RouterPrxPtr
 IceInternal::ReferenceFactory::getDefaultRouter() const
 {
     return _defaultRouter;
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator)
+IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrxPtr& defaultLocator)
 {
     if(defaultLocator == _defaultLocator)
     {
@@ -693,7 +646,7 @@ IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocato
     return factory;
 }
 
-LocatorPrx
+LocatorPrxPtr
 IceInternal::ReferenceFactory::getDefaultLocator() const
 {
     return _defaultLocator;
@@ -815,7 +768,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         string property;
 
         property = propertyPrefix + ".Locator";
-        LocatorPrx locator = LocatorPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _communicator->propertyToProxy(property));
         if(locator)
         {
             if(locator->ice_getEncodingVersion() != encoding)
@@ -829,7 +782,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         }
 
         property = propertyPrefix + ".Router";
-        RouterPrx router = RouterPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _communicator->propertyToProxy(property));
         if(router)
         {
             if(propertyPrefix.size() > 7 && propertyPrefix.substr(propertyPrefix.size() - 7, 7) == ".Router")
@@ -859,17 +812,16 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
             string type = properties->getProperty(property);
             if(type == "Random")
             {
-                endpointSelection = Random;
+                endpointSelection = ICE_ENUM(EndpointSelectionType, Random);
             }
             else if(type == "Ordered")
             {
-                endpointSelection = Ordered;
+                endpointSelection = ICE_ENUM(EndpointSelectionType, Ordered);
             }
             else
             {
-                EndpointSelectionTypeParseException ex(__FILE__, __LINE__);
-                ex.str = "illegal value `" + type + "'; expected `Random' or `Ordered'";
-                throw ex;
+                throw EndpointSelectionTypeParseException(__FILE__, __LINE__, "illegal value `" + type +
+                                                          "'; expected `Random' or `Ordered'");
             }
         }
 
@@ -934,4 +886,3 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
                                  invocationTimeout,
                                  ctx);
 }
-