zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/Ice/EndpointFactoryManager.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.
@@ -17,19 +17,25 @@
 #include <Ice/EndpointFactoryF.h>
 #include <Ice/EndpointFactoryManagerF.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class InputStream;
+
+}
+
+namespace IceInternal
+{
 
 class EndpointFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
 {
 public:
 
+    void initialize() const;
     void add(const EndpointFactoryPtr&);
     EndpointFactoryPtr get(::Ice::Short) const;
     EndpointIPtr create(const std::string&, bool) const;
-    EndpointIPtr read(BasicStream*) const;
+    EndpointIPtr read(Ice::InputStream*) const;
 
 private:
 

data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.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.

data/ext/ice/cpp/src/Ice/EndpointI.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.
@@ -8,11 +8,27 @@
 // **********************************************************************
 
 #include <Ice/EndpointI.h>
+#include <Ice/OutputStream.h>
 
 using namespace std;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(EndpointI_connectors* p) { return p; }
+#endif
+
+IceInternal::EndpointI_connectors::~EndpointI_connectors()
+{
+    // Out of line to avoid weak vtable
+}
+
+void
+IceInternal::EndpointI::streamWrite(Ice::OutputStream* s) const
+{
+    s->startEncapsulation();
+    streamWriteImpl(s);
+    s->endEncapsulation();
+}
 
 string
 IceInternal::EndpointI::toString() const

data/ext/ice/cpp/src/Ice/EndpointI.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.
@@ -17,16 +17,25 @@
 #include <Ice/ConnectorF.h>
 #include <Ice/AcceptorF.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+class InputStream;
+
+}
 
-class ICE_API EndpointI_connectors : public virtual IceUtil::Shared
+namespace IceInternal
+{
+
+class ICE_API EndpointI_connectors
+#ifndef ICE_CPP11_MAPPING
+    : public virtual IceUtil::Shared
+#endif
 {
 public:
 
-    virtual ~EndpointI_connectors() { }
+    virtual ~EndpointI_connectors();
 
     virtual void connectors(const std::vector<ConnectorPtr>&) = 0;
     virtual void exception(const Ice::LocalException&) = 0;
@@ -39,7 +48,8 @@ public:
     //
     // Marshal the endpoint.
     //
-    virtual void streamWrite(BasicStream*) const = 0;
+    virtual void streamWrite(Ice::OutputStream*) const;
+    virtual void streamWriteImpl(Ice::OutputStream*) const = 0;
 
     //
     // Return the endpoint type.
@@ -118,10 +128,21 @@ public:
     virtual AcceptorPtr acceptor(const std::string&) const = 0;
 
     //
-    // Expand endpoint out in to separate endpoints for each local
+    // Expand endpoint out into separate endpoints for each local
     // host if listening on INADDR_ANY on server side.
     //
-    virtual std::vector<EndpointIPtr> expand() const = 0;
+    virtual std::vector<EndpointIPtr> expandIfWildcard() const = 0;
+
+    //
+    // Expand endpoint out into separate endpoints for each IP
+    // address returned by the DNS resolver. Also returns the
+    // endpoint which can be used to connect to the returned
+    // endpoints or null if no specific endpoint can be used to
+    // connect to these endpoints (e.g.: with the IP endpoint,
+    // it returns this endpoint if it uses a fixed port, null
+    // otherwise).
+    //
+    virtual std::vector<EndpointIPtr> expandHost(IceInternal::EndpointIPtr&) const = 0;
 
     //
     // Check whether the endpoint is equivalent to another one.
@@ -131,8 +152,10 @@ public:
     //
     // Compare endpoints for sorting purposes.
     //
+#ifndef ICE_CPP11_MAPPING
     virtual bool operator==(const Ice::LocalObject&) const = 0;
     virtual bool operator<(const Ice::LocalObject&) const = 0;
+#endif
 
     virtual ::Ice::Int hash() const = 0;
 
@@ -150,6 +173,7 @@ protected:
 
 };
 
+#ifndef ICE_CPP11_MAPPING
 inline bool operator==(const EndpointI& l, const EndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
@@ -159,6 +183,7 @@ inline bool operator<(const EndpointI& l, const EndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
+#endif
 
 template<typename T> class InfoI : public T
 {
@@ -166,6 +191,8 @@ public:
 
     InfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
     {
+        T::compress = _endpoint->compress();
+        T::timeout = _endpoint->timeout();
     }
 
     virtual Ice::Short
@@ -191,7 +218,6 @@ private:
     const EndpointIPtr _endpoint;
 };
 
-
 }
 
 #endif

data/ext/ice/cpp/src/Ice/EndpointIF.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.
@@ -17,25 +17,38 @@ namespace IceInternal
 {
 
 class EndpointI;
+class TcpEndpointI;
+class UdpEndpointI;
+class WSEndpoint;
+class EndpointI_connectors;
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+using EndpointIPtr = ::std::shared_ptr<EndpointI>;
+using TcpEndpointIPtr = ::std::shared_ptr<TcpEndpointI>;
+using UdpEndpointIPtr = ::std::shared_ptr<UdpEndpointI>;
+using WSEndpointPtr = ::std::shared_ptr<WSEndpoint>;
+using EndpointI_connectorsPtr = ::std::shared_ptr<EndpointI_connectors>;
+
+#else // C++98 mapping
+
 ICE_API IceUtil::Shared* upCast(EndpointI*);
 typedef Handle<EndpointI> EndpointIPtr;
 
-class TcpEndpointI;
 ICE_API IceUtil::Shared* upCast(TcpEndpointI*);
 typedef Handle<TcpEndpointI> TcpEndpointIPtr;
 
-class UdpEndpointI;
 ICE_API IceUtil::Shared* upCast(UdpEndpointI*);
 typedef Handle<UdpEndpointI> UdpEndpointIPtr;
 
-class WSEndpoint;
 ICE_API IceUtil::Shared* upCast(WSEndpoint*);
 typedef Handle<WSEndpoint> WSEndpointPtr;
 
-class EndpointI_connectors;
 ICE_API IceUtil::Shared* upCast(EndpointI_connectors*);
 typedef Handle<EndpointI_connectors> EndpointI_connectorsPtr;
 
+#endif
+
 }
 
 #endif

data/ext/ice/cpp/src/Ice/EndpointTypes.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,34 @@
 #endif
 #include <Ice/EndpointTypes.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.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
+
+#else // C++98 mapping
+
 namespace Ice
 {
 }
+
+#endif

data/ext/ice/cpp/src/Ice/EventHandler.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.
@@ -14,18 +14,20 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; }
+#endif
 
 IceInternal::EventHandler::EventHandler() :
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
-    _ready(SocketOperationNone),
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     _pending(SocketOperationNone),
     _started(SocketOperationNone),
+    _completed(SocketOperationNone),
     _finish(false),
 #else
     _disabled(SocketOperationNone),
 #endif
-    _hasMoreData(false),
+    _ready(SocketOperationNone),
     _registered(SocketOperationNone)
 {
 }

data/ext/ice/cpp/src/Ice/EventHandler.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.
@@ -14,17 +14,22 @@
 #include <Ice/EventHandlerF.h>
 #include <Ice/InstanceF.h>
 #include <Ice/ThreadPoolF.h>
-#include <Ice/BasicStream.h>
 #include <Ice/Network.h>
+#include <Ice/VirtualShared.h>
 
 namespace IceInternal
 {
 
-class ICE_API EventHandler : virtual public ::IceUtil::Shared
+class ICE_API EventHandler :
+#ifdef ICE_CPP11_MAPPING
+        public EnableSharedFromThis<EventHandler>
+#else
+        public virtual Ice::LocalObject
+#endif
 {
 public:
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     //
     // Called to start a new asynchronous read or write operation.
     //
@@ -53,19 +58,19 @@ public:
     virtual NativeInfoPtr getNativeInfo() = 0;
 
 protected:
-    
+
     EventHandler();
     virtual ~EventHandler();
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
-    SocketOperation _ready;
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     SocketOperation _pending;
     SocketOperation _started;
+    SocketOperation _completed;
     bool _finish;
 #else
     SocketOperation _disabled;
 #endif
-    bool _hasMoreData;
+    SocketOperation _ready;
     SocketOperation _registered;
 
     friend class ThreadPool;

data/ext/ice/cpp/src/Ice/EventHandlerF.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.
@@ -18,9 +18,12 @@ namespace IceInternal
 {
 
 class EventHandler;
+#ifdef ICE_CPP11_MAPPING
+using EventHandlerPtr = ::std::shared_ptr<EventHandler>;
+#else
 ICE_API IceUtil::Shared* upCast(EventHandler*);
 typedef Handle<EventHandler> EventHandlerPtr;
-
+#endif
 }
 
 #endif

data/ext/ice/cpp/src/Ice/Exception.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.
@@ -12,11 +12,12 @@
 #include <Ice/Network.h>
 #include <Ice/Plugin.h>
 #include <Ice/SlicedData.h>
-#include <Ice/BasicStream.h>
-#include <Ice/Stream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
+#include <Ice/Initialize.h>
 #include <IceUtil/StringUtil.h>
-#ifdef ICE_OS_WINRT
-#    include <IceUtil/StringConverter.h>
+#ifdef ICE_OS_UWP
+#    include <Ice/StringConverter.h>
 #endif
 #include <iomanip>
 
@@ -34,7 +35,7 @@ socketErrorToString(int error)
     {
         return "unknown error";
     }
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     if(error == E_ACCESSDENIED)
     {
         ostringstream os;
@@ -48,9 +49,9 @@ socketErrorToString(int error)
         // Don't need to use a wide string converter as the wide string come
         // from Windows API.
         //
-        return IceUtil::wstringToString(
+        return wstringToString(
             static_cast<Windows::Networking::Sockets::SocketErrorStatus>(error).ToString()->Data(),
-            IceUtil::getProcessStringConverter());
+            getProcessStringConverter());
     }
 #else
     return IceUtilInternal::errorToString(error);
@@ -66,17 +67,17 @@ namespace Ex
 {
 
 void
-throwUOE(const string& expectedType, const ObjectPtr& v)
+throwUOE(const string& expectedType, const ValuePtr& v)
 {
     //
     // If the object is an unknown sliced object, we didn't find an
-    // object factory, in this case raise a NoObjectFactoryException
+    // value factory, in this case raise a NoValueFactoryException
     // instead.
     //
-    UnknownSlicedObject* uso = dynamic_cast<UnknownSlicedObject*>(v.get());
-    if(uso)
+    UnknownSlicedValue* usv = dynamic_cast<UnknownSlicedValue*>(v.get());
+    if(usv)
     {
-        throw NoObjectFactoryException(__FILE__, __LINE__, "", uso->getUnknownTypeId());
+        throw NoValueFactoryException(__FILE__, __LINE__, "", usv->ice_id());
     }
 
     string type = v->ice_id();
@@ -102,52 +103,54 @@ throwMarshalException(const char* file, int line, const string& reason)
 }
 }
 
-void
-Ice::UserException::__write(::IceInternal::BasicStream* os) const
+namespace
+{
+
+const string userException_ids[] =
 {
-    os->startWriteException(0);
-    __writeImpl(os);
-    os->endWriteException();
+    "::Ice::UserException"
+};
+
 }
 
-void
-Ice::UserException::__read(::IceInternal::BasicStream* is)
+const std::string&
+Ice::UserException::ice_staticId()
 {
-    is->startReadException();
-    __readImpl(is);
-    is->endReadException(false);
+    return userException_ids[0];
 }
 
-void
-Ice::UserException::__write(const Ice::OutputStreamPtr& os) const
+#ifdef ICE_CPP11_MAPPING
+unique_ptr<Ice::UserException>
+Ice::UserException::ice_clone() const
 {
-    os->startException(0);
-    __writeImpl(os);
-    os->endException();
+    return unique_ptr<UserException>(static_cast<UserException*>(ice_cloneImpl()));
 }
+#endif
 
-void
-Ice::UserException::__read(const Ice::InputStreamPtr& is)
+Ice::SlicedDataPtr
+Ice::UserException::ice_getSlicedData() const
 {
-    is->startException();
-    __readImpl(is);
-    is->endException(false);
+    return ICE_NULLPTR;
 }
 
 void
-Ice::UserException::__writeImpl(const Ice::OutputStreamPtr&) const
+Ice::UserException::_write(::Ice::OutputStream* os) const
 {
-    throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support");
+    os->startException(0);
+    _writeImpl(os);
+    os->endException();
 }
 
 void
-Ice::UserException::__readImpl(const Ice::InputStreamPtr&)
+Ice::UserException::_read(::Ice::InputStream* is)
 {
-    throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support");
+    is->startException();
+    _readImpl(is);
+    is->endException(false);
 }
 
 bool
-Ice::UserException::__usesClasses() const
+Ice::UserException::_usesClasses() const
 {
     return false;
 }
@@ -157,8 +160,36 @@ Ice::LocalException::LocalException(const char* file, int line) :
 {
 }
 
-Ice::LocalException::~LocalException() throw()
+Ice::LocalException::~LocalException()
+#ifndef ICE_CPP11_COMPILER
+    throw()
+#endif
+{
+   // Out of line to avoid weak vtable
+}
+
+#ifdef ICE_CPP11_MAPPING
+unique_ptr<Ice::LocalException>
+Ice::LocalException::ice_clone() const
 {
+    return unique_ptr<LocalException>(static_cast<LocalException*>(ice_cloneImpl()));
+}
+#endif
+
+namespace
+{
+
+const string localException_ids[] =
+{
+    "::Ice::LocalException"
+};
+
+}
+
+const std::string&
+Ice::LocalException::ice_staticId()
+{
+    return localException_ids[0];
 }
 
 Ice::SystemException::SystemException(const char* file, int line) :
@@ -166,32 +197,36 @@ Ice::SystemException::SystemException(const char* file, int line) :
 {
 }
 
-Ice::SystemException::~SystemException() throw()
+Ice::SystemException::~SystemException()
+#ifndef ICE_CPP11_COMPILER
+    throw()
+#endif
 {
 }
 
-#if defined(__SUNPRO_CC)
-ostream&
-Ice::operator<<(ostream& out, const Ice::UserException& ex)
+#ifdef ICE_CPP11_MAPPING
+unique_ptr<Ice::SystemException>
+Ice::SystemException::ice_clone() const
 {
-    ex.ice_print(out);
-    return out;
+    return unique_ptr<SystemException>(static_cast<SystemException*>(ice_cloneImpl()));
 }
+#endif
 
-ostream&
-Ice::operator<<(ostream& out, const Ice::LocalException& ex)
+namespace
 {
-    ex.ice_print(out);
-    return out;
+
+const string systemException_ids[] =
+{
+    "::Ice::SystemException"
+};
+
 }
 
-ostream&
-Ice::operator<<(ostream& out, const Ice::SystemException& ex)
+const std::string&
+Ice::SystemException::ice_staticId()
 {
-    ex.ice_print(out);
-    return out;
+    return systemException_ids[0];
 }
-#endif
 
 void
 Ice::InitializationException::ice_print(ostream& out) const
@@ -311,16 +346,7 @@ void
 Ice::IllegalIdentityException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nillegal identity: `";
-    if(id.category.empty())
-    {
-        out << IceUtilInternal::escapeString(id.name, "/");
-    }
-    else
-    {
-        out << IceUtilInternal::escapeString(id.category, "/") << '/' << IceUtilInternal::escapeString(id.name, "/");
-    }
-    out << "'";
+    out << ":\nillegal identity: `" << identityToString(id, ICE_ENUM(ToStringMode, Unicode)) << "'";
 }
 
 void
@@ -330,20 +356,10 @@ Ice::IllegalServantException::ice_print(ostream& out) const
     out << ":\nillegal servant: `" << reason << "'";
 }
 
-
 static void
 printFailedRequestData(ostream& out, const RequestFailedException& ex)
 {
-    out << ":\nidentity: `";
-    if(ex.id.category.empty())
-    {
-        out << IceUtilInternal::escapeString(ex.id.name, "/");
-    }
-    else
-    {
-        out << IceUtilInternal::escapeString(ex.id.category, "/") << '/' << IceUtilInternal::escapeString(ex.id.name, "/");
-    }
-    out << "'";
+    out << ":\nidentity: `" << identityToString(ex.id, ICE_ENUM(ToStringMode, Unicode)) << "'";
     out << "\nfacet: " << ex.facet;
     out << "\noperation: " << ex.operation;
 }
@@ -450,7 +466,7 @@ Ice::DNSException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
     out << ":\nDNS error: ";
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     out << socketErrorToString(error);
 #else
     out << errorToStringDNS(error);
@@ -465,7 +481,6 @@ Ice::OperationInterruptedException::ice_print(ostream& out) const
     out << ":\noperation interrupted";
 }
 
-
 void
 Ice::TimeoutException::ice_print(ostream& out) const
 {
@@ -621,14 +636,10 @@ Ice::CloseConnectionException::ice_print(ostream& out) const
 }
 
 void
-Ice::ForcedCloseConnectionException::ice_print(ostream& out) const
+Ice::ConnectionManuallyClosedException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: connection forcefully closed";
-    if(!reason.empty())
-    {
-        out << ":\n" << reason;
-    }
+    out << ":\nprotocol error: connection manually closed (" << (graceful ? "gracefully" : "forcefully") << ")";
 }
 
 void
@@ -698,7 +709,7 @@ Ice::UnmarshalOutOfBoundsException::ice_print(ostream& out) const
 }
 
 void
-Ice::NoObjectFactoryException::ice_print(ostream& out) const
+Ice::NoValueFactoryException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
     out << ":\nprotocol error: no suitable object factory found for `" << type << "'";
@@ -831,11 +842,9 @@ Ice::ResponseSentException::ice_print(ostream& out) const
     out << ":\nresponse sent exception";
 }
 
-#ifdef ICE_USE_CFSTREAM
 void
 Ice::CFNetworkException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
     out << ":\nnetwork exception: domain: " << domain << " error: " << error;
 }
-#endif