zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Ice/TraceLevels.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_TRACE_LEVELS_H
 #define ICE_TRACE_LEVELS_H

data/ext/ice/cpp/src/Ice/TraceLevelsF.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_TRACE_LEVELS_F_H
 #define ICE_TRACE_LEVELS_F_H
@@ -18,7 +13,7 @@ namespace IceInternal
 {
 
 class TraceLevels;
-ICE_API IceUtil::Shared* upCast(TraceLevels*);
+IceUtil::Shared* upCast(TraceLevels*);
 typedef Handle<TraceLevels> TraceLevelsPtr;
 
 }

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

@@ -1,22 +1,18 @@
-// **********************************************************************
 //
-// 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 <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <IceUtil/StringUtil.h>
+#include <Ice/StringUtil.h>
 #include <Ice/TraceUtil.h>
 #include <Ice/Instance.h>
 #include <Ice/Object.h>
 #include <Ice/Proxy.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/Logger.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Protocol.h>
 #include <Ice/ReplyStatus.h>
 #include <set>
@@ -26,18 +22,24 @@ using namespace Ice;
 using namespace IceInternal;
 
 static void
-printIdentityFacetOperation(ostream& s, BasicStream& stream)
+printIdentityFacetOperation(ostream& s, InputStream& stream)
 {
+    ToStringMode toStringMode = ICE_ENUM(ToStringMode, Unicode);
+    if(stream.instance())
+    {
+        toStringMode = stream.instance()->toStringMode();
+    }
+
     Identity identity;
     stream.read(identity);
-    s << "\nidentity = " << stream.instance()->identityToString(identity);
+    s << "\nidentity = " << Ice::identityToString(identity, toStringMode);
 
     vector<string> facet;
     stream.read(facet);
     s << "\nfacet = ";
     if(!facet.empty())
     {
-        s << IceUtilInternal::escapeString(facet[0], "");
+        s << escapeString(facet[0], "", toStringMode);
     }
 
     string operation;
@@ -66,28 +68,28 @@ getMessageTypeAsString(Byte type)
 }
 
 static void
-printRequestHeader(ostream& s, BasicStream& stream)
+printRequestHeader(ostream& s, InputStream& stream)
 {
     printIdentityFacetOperation(s, stream);
 
     Byte mode;
     stream.read(mode);
     s << "\nmode = " << static_cast<int>(mode) << ' ';
-    switch(mode)
+    switch(static_cast<OperationMode>(mode))
     {
-        case Normal:
+        case ICE_ENUM(OperationMode, Normal):
         {
             s << "(normal)";
             break;
         }
 
-        case Nonmutating:
+        case ICE_ENUM(OperationMode, Nonmutating):
         {
             s << "(nonmutating)";
             break;
         }
 
-        case Idempotent:
+        case ICE_ENUM(OperationMode, Idempotent):
         {
             s << "(idempotent)";
             break;
@@ -114,7 +116,7 @@ printRequestHeader(ostream& s, BasicStream& stream)
         }
     }
 
-    Ice::EncodingVersion v = stream.skipEncaps();
+    Ice::EncodingVersion v = stream.skipEncapsulation();
     if(v > Ice::Encoding_1_0)
     {
         s << "\nencoding = " << v;
@@ -122,7 +124,7 @@ printRequestHeader(ostream& s, BasicStream& stream)
 }
 
 static Byte
-printHeader(ostream& s, BasicStream& stream)
+printHeader(ostream& s, InputStream& stream)
 {
     Byte magicNumber;
     stream.read(magicNumber);   // Don't bother printing the magic number
@@ -187,7 +189,7 @@ printHeader(ostream& s, BasicStream& stream)
 }
 
 static void
-printRequest(ostream& s, BasicStream& stream)
+printRequest(ostream& s, InputStream& stream)
 {
     Int requestId;
     stream.read(requestId);
@@ -201,7 +203,7 @@ printRequest(ostream& s, BasicStream& stream)
 }
 
 static void
-printBatchRequest(ostream& s, BasicStream& stream)
+printBatchRequest(ostream& s, InputStream& stream)
 {
     int batchRequestNum;
     stream.read(batchRequestNum);
@@ -215,7 +217,7 @@ printBatchRequest(ostream& s, BasicStream& stream)
 }
 
 static void
-printReply(ostream& s, BasicStream& stream)
+printReply(ostream& s, InputStream& stream)
 {
     Int requestId;
     stream.read(requestId);
@@ -319,7 +321,7 @@ printReply(ostream& s, BasicStream& stream)
 
     if(replyStatus == replyOK || replyStatus == replyUserException)
     {
-        Ice::EncodingVersion v = stream.skipEncaps();
+        Ice::EncodingVersion v = stream.skipEncapsulation();
         if(v > Ice::Encoding_1_0)
         {
             s << "\nencoding = " << v;
@@ -328,7 +330,7 @@ printReply(ostream& s, BasicStream& stream)
 }
 
 static Byte
-printMessage(ostream& s, BasicStream& stream)
+printMessage(ostream& s, InputStream& stream)
 {
     Byte type = printHeader(s, stream);
 
@@ -408,29 +410,28 @@ IceInternal::traceSlicing(const char* kind, const string& typeId, const char* sl
 }
 
 void
-IceInternal::traceSend(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+IceInternal::traceSend(const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
     {
-        BasicStream& stream = const_cast<BasicStream&>(str);
-        BasicStream::Container::iterator p = stream.i;
-        stream.i = stream.b.begin();
+        OutputStream& stream = const_cast<OutputStream&>(str);
+        InputStream is(stream.instance(), stream.getEncoding(), stream);
+        is.i = is.b.begin();
 
         ostringstream s;
-        Byte type = printMessage(s, stream);
+        Byte type = printMessage(s, is);
 
         logger->trace(tl->protocolCat, "sending " + getMessageTypeAsString(type) + " " + s.str());
-        stream.i = p;
     }
 }
 
 void
-IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+IceInternal::traceRecv(const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
     {
-        BasicStream& stream = const_cast<BasicStream&>(str);
-        BasicStream::Container::iterator p = stream.i;
+        InputStream& stream = const_cast<InputStream&>(str);
+        InputStream::Container::iterator p = stream.i;
         stream.i = stream.b.begin();
 
         ostringstream s;
@@ -442,12 +443,29 @@ IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const Tr
 }
 
 void
-IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+IceInternal::trace(const char* heading, const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+{
+    if(tl->protocol >= 1)
+    {
+        OutputStream& stream = const_cast<OutputStream&>(str);
+        InputStream is(stream.instance(), stream.getEncoding(), stream);
+        is.i = is.b.begin();
+
+        ostringstream s;
+        s << heading;
+        printMessage(s, is);
+
+        logger->trace(tl->protocolCat, s.str());
+    }
+}
+
+void
+IceInternal::trace(const char* heading, const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
     {
-        BasicStream& stream = const_cast<BasicStream&>(str);
-        BasicStream::Container::iterator p = stream.i;
+        InputStream& stream = const_cast<InputStream&>(str);
+        InputStream::Container::iterator p = stream.i;
         stream.i = stream.b.begin();
 
         ostringstream s;
@@ -458,4 +476,3 @@ IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr&
         stream.i = p;
     }
 }
-

data/ext/ice/cpp/src/Ice/TraceUtil.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_TRACE_UTIL_H
 #define ICE_TRACE_UTIL_H
@@ -13,14 +8,21 @@
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+class InputStream;
+
+}
+
+namespace IceInternal
+{
 
-void traceSend(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void traceRecv(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void trace(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceSend(const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceRecv(const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void trace(const char*, const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void trace(const char*, const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 void traceSlicing(const char*, const ::std::string&, const char *, const ::Ice::LoggerPtr&);
 
 }

data/ext/ice/cpp/src/Ice/Transceiver.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/Transceiver.h>
 
@@ -21,4 +16,3 @@ IceInternal::Transceiver::bind()
     assert(false);
     return 0;
 }
-

data/ext/ice/cpp/src/Ice/Transceiver.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_TRANSCEIVER_H
 #define ICE_TRANSCEIVER_H
@@ -21,23 +16,24 @@ namespace IceInternal
 
 class Buffer;
 
-class ICE_API Transceiver : virtual public ::IceUtil::Shared
+class ICE_API Transceiver : public virtual ::IceUtil::Shared
 {
 public:
 
     virtual NativeInfoPtr getNativeInfo() = 0;
 
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&) = 0;
+    virtual SocketOperation initialize(Buffer&, Buffer&) = 0;
     virtual SocketOperation closing(bool, const Ice::LocalException&) = 0;
+
     virtual void close() = 0;
     virtual EndpointIPtr bind();
     virtual SocketOperation write(Buffer&) = 0;
-    virtual SocketOperation read(Buffer&, bool&) = 0;
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+    virtual SocketOperation read(Buffer&) = 0;
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     virtual bool startWrite(Buffer&) = 0;
     virtual void finishWrite(Buffer&) = 0;
     virtual void startRead(Buffer&) = 0;
-    virtual void finishRead(Buffer&, bool&) = 0;
+    virtual void finishRead(Buffer&) = 0;
 #endif
 
     virtual std::string protocol() const = 0;
@@ -45,7 +41,7 @@ public:
     virtual std::string toDetailedString() const = 0;
     virtual Ice::ConnectionInfoPtr getInfo() const = 0;
     virtual void checkSendSize(const Buffer&) = 0;
-    virtual void setBufferSize(int rcvSize, int sndSize) = 0;
+    virtual void setBufferSize(int, int) = 0;
 };
 
 }

data/ext/ice/cpp/src/Ice/TransceiverF.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_TRANSCEIVER_F_H
 #define ICE_TRANSCEIVER_F_H
@@ -30,8 +25,8 @@ ICE_API IceUtil::Shared* upCast(UdpTransceiver*);
 typedef Handle<UdpTransceiver> UdpTransceiverPtr;
 
 class WSTransceiver;
-ICE_API IceUtil::Shared* upCast(Transceiver*);
-typedef Handle<Transceiver> TransceiverPtr;
+ICE_API IceUtil::Shared* upCast(WSTransceiver*);
+typedef Handle<WSTransceiver> WSTransceiverPtr;
 
 }
 

data/ext/ice/cpp/src/Ice/UdpConnector.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/UdpConnector.h>
 #include <Ice/ProtocolInstance.h>
@@ -71,12 +66,6 @@ IceInternal::UdpConnector::operator==(const Connector& r) const
     return true;
 }
 
-bool
-IceInternal::UdpConnector::operator!=(const Connector& r) const
-{
-    return !operator==(r);
-}
-
 bool
 IceInternal::UdpConnector::operator<(const Connector& r) const
 {
@@ -130,13 +119,16 @@ IceInternal::UdpConnector::UdpConnector(const ProtocolInstancePtr& instance, con
                                         const std::string& connectionId) :
     _instance(instance),
     _addr(addr),
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     _sourceAddr(sourceAddr),
 #endif
     _mcastInterface(mcastInterface),
     _mcastTtl(mcastTtl),
     _connectionId(connectionId)
 {
+#ifdef ICE_OS_UWP
+    UNREFERENCED_PARAMETER(sourceAddr);
+#endif
 }
 
 IceInternal::UdpConnector::~UdpConnector()

data/ext/ice/cpp/src/Ice/UdpConnector.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_UDP_CONNECTOR_H
 #define ICE_UDP_CONNECTOR_H
@@ -28,7 +23,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const Connector&) const;
-    virtual bool operator!=(const Connector&) const;
     virtual bool operator<(const Connector&) const;
 
 private: