zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/Connection.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -41,10 +36,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -161,18 +156,17 @@ struct ACM
     /**
      * The close semantics.
      */
-    ACMClose close;
+    ::Ice::ACMClose close;
     /**
      * The heartbeat semantics.
      */
-    ACMHeartbeat heartbeat;
+    ::Ice::ACMHeartbeat heartbeat;
 
     /**
-     * Obtains a tuple containing all of the exception's data members.
+     * Obtains a tuple containing all of the struct's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const int&, const ACMClose&, const ACMHeartbeat&> ice_tuple() const
+    std::tuple<const int&, const ::Ice::ACMClose&, const ::Ice::ACMHeartbeat&> ice_tuple() const
     {
         return std::tie(timeout, close, heartbeat);
     }
@@ -217,7 +211,7 @@ namespace Ice
 {
 
 /**
- * Base class providing access to the connection details. *
+ * Base class providing access to the connection details.
  * \headerfile Ice/Ice.h
  */
 class ICE_CLASS(ICE_API) ConnectionInfo
@@ -240,11 +234,11 @@ public:
      * @param adapterName The name of the adapter associated with the connection.
      * @param connectionId The connection id.
      */
-    ConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
-        underlying(::std::move(underlying)),
+    ConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
+        underlying(underlying),
         incoming(incoming),
-        adapterName(::std::move(adapterName)),
-        connectionId(::std::move(connectionId))
+        adapterName(adapterName),
+        connectionId(connectionId)
     {
     }
 
@@ -252,7 +246,7 @@ public:
      * The information of the underyling transport or null if there's
      * no underlying transport.
      */
-    ::std::shared_ptr<ConnectionInfo> underlying;
+    ::std::shared_ptr<::Ice::ConnectionInfo> underlying;
     /**
      * Whether or not the connection is an incoming or outgoing
      * connection.
@@ -458,8 +452,7 @@ public:
 
     /**
      * Set the active connection management parameters.
-     * @param timeout The timeout value in seconds. It must be positive or 0, if a negative
-     * value is given, an invalid argument exception will be raised.
+     * @param timeout The timeout value in seconds, must be &gt;= 0.
      * @param close The close condition
      * @param heartbeat The hertbeat condition
      */
@@ -526,9 +519,9 @@ public:
     ICE_MEMBER(ICE_API) virtual ~IPConnectionInfo();
 
     IPConnectionInfo() :
-        localAddress(u8""),
+        localAddress(""),
         localPort(-1),
-        remoteAddress(u8""),
+        remoteAddress(""),
         remotePort(-1)
     {
     }
@@ -549,11 +542,11 @@ public:
      * @param remoteAddress The remote address.
      * @param remotePort The remote port.
      */
-    IPConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort) :
-        ConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId)),
-        localAddress(::std::move(localAddress)),
+    IPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort) :
+        ConnectionInfo(underlying, incoming, adapterName, connectionId),
+        localAddress(localAddress),
         localPort(localPort),
-        remoteAddress(::std::move(remoteAddress)),
+        remoteAddress(remoteAddress),
         remotePort(remotePort)
     {
     }
@@ -610,8 +603,8 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    TCPConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, int rcvSize, int sndSize) :
-        IPConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId), ::std::move(localAddress), localPort, ::std::move(remoteAddress), remotePort),
+    TCPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, int rcvSize, int sndSize) :
+        IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
         rcvSize(rcvSize),
         sndSize(sndSize)
     {
@@ -664,9 +657,9 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    UDPConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, const ::std::string& mcastAddress, int mcastPort, int rcvSize, int sndSize) :
-        IPConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId), ::std::move(localAddress), localPort, ::std::move(remoteAddress), remotePort),
-        mcastAddress(::std::move(mcastAddress)),
+    UDPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, const ::std::string& mcastAddress, int mcastPort, int rcvSize, int sndSize) :
+        IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
+        mcastAddress(mcastAddress),
         mcastPort(mcastPort),
         rcvSize(rcvSize),
         sndSize(sndSize)
@@ -716,16 +709,16 @@ public:
      * @param connectionId The connection id.
      * @param headers The headers from the HTTP upgrade request.
      */
-    WSConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const HeaderDict& headers) :
-        ConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId)),
-        headers(::std::move(headers))
+    WSConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::Ice::HeaderDict& headers) :
+        ConnectionInfo(underlying, incoming, adapterName, connectionId),
+        headers(headers)
     {
     }
 
     /**
      * The headers from the HTTP upgrade request.
      */
-    HeaderDict headers;
+    ::Ice::HeaderDict headers;
 };
 
 }
@@ -895,15 +888,15 @@ struct ACM
     /**
      * A timeout value in seconds.
      */
-    Int timeout;
+    ::Ice::Int timeout;
     /**
      * The close semantics.
      */
-    ACMClose close;
+    ::Ice::ACMClose close;
     /**
      * The heartbeat semantics.
      */
-    ACMHeartbeat heartbeat;
+    ::Ice::ACMHeartbeat heartbeat;
 
     bool operator==(const ACM& rhs_) const
     {
@@ -1030,7 +1023,7 @@ namespace Ice
 {
 
 /**
- * Base class providing access to the connection details. *
+ * Base class providing access to the connection details.
  * \headerfile Ice/Ice.h
  */
 class ICE_API ConnectionInfo : public virtual LocalObject
@@ -1052,7 +1045,7 @@ public:
      * @param adapterName The name of the adapter associated with the connection.
      * @param connectionId The connection id.
      */
-    ConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
+    ConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
         underlying(underlying),
         incoming(incoming),
         adapterName(adapterName),
@@ -1060,11 +1053,16 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    ConnectionInfo(const ConnectionInfo&) = default;
+    ConnectionInfo& operator=(const ConnectionInfo&) = default;
+#endif
+
     /**
      * The information of the underyling transport or null if there's
      * no underlying transport.
      */
-    ConnectionInfoPtr underlying;
+    ::Ice::ConnectionInfoPtr underlying;
     /**
      * Whether or not the connection is an incoming or outgoing
      * connection.
@@ -1106,6 +1104,12 @@ public:
 
     virtual ~CloseCallback();
 
+#ifdef ICE_CPP11_COMPILER
+    CloseCallback() = default;
+    CloseCallback(const CloseCallback&) = default;
+    CloseCallback& operator=(const CloseCallback&) = default;
+#endif
+
     /**
      * This method is called by the the connection when the connection
      * is closed. If the callback needs more information about the closure,
@@ -1141,6 +1145,12 @@ public:
 
     virtual ~HeartbeatCallback();
 
+#ifdef ICE_CPP11_COMPILER
+    HeartbeatCallback() = default;
+    HeartbeatCallback(const HeartbeatCallback&) = default;
+    HeartbeatCallback& operator=(const HeartbeatCallback&) = default;
+#endif
+
     /**
      * This method is called by the the connection when a heartbeat is
      * received from the peer.
@@ -1173,6 +1183,12 @@ public:
 
     virtual ~Connection();
 
+#ifdef ICE_CPP11_COMPILER
+    Connection() = default;
+    Connection(const Connection&) = default;
+    Connection& operator=(const Connection&) = default;
+#endif
+
     /**
      * Manually close the connection using the specified closure mode.
      * @param mode Determines how the connection will be closed.
@@ -1330,8 +1346,7 @@ public:
 
     /**
      * Set the active connection management parameters.
-     * @param timeout The timeout value in seconds. It must be positive or 0, if a negative
-     * value is given, an invalid argument exception will be raised.
+     * @param timeout The timeout value in seconds, must be &gt;= 0.
      * @param close The close condition
      * @param heartbeat The hertbeat condition
      */
@@ -1431,7 +1446,7 @@ public:
      * @param remoteAddress The remote address.
      * @param remotePort The remote port.
      */
-    IPConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, Int localPort, const ::std::string& remoteAddress, Int remotePort) :
+    IPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort) :
         ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId),
         localAddress(localAddress),
         localPort(localPort),
@@ -1440,6 +1455,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    IPConnectionInfo(const IPConnectionInfo&) = default;
+    IPConnectionInfo& operator=(const IPConnectionInfo&) = default;
+#endif
+
     /**
      * The local address.
      */
@@ -1447,7 +1467,7 @@ public:
     /**
      * The local port.
      */
-    Int localPort;
+    ::Ice::Int localPort;
     /**
      * The remote address.
      */
@@ -1455,7 +1475,7 @@ public:
     /**
      * The remote port.
      */
-    Int remotePort;
+    ::Ice::Int remotePort;
 };
 
 /// \cond INTERNAL
@@ -1502,21 +1522,26 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    TCPConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, Int localPort, const ::std::string& remoteAddress, Int remotePort, Int rcvSize, Int sndSize) :
+    TCPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort, ::Ice::Int rcvSize, ::Ice::Int sndSize) :
         ::Ice::IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
         rcvSize(rcvSize),
         sndSize(sndSize)
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    TCPConnectionInfo(const TCPConnectionInfo&) = default;
+    TCPConnectionInfo& operator=(const TCPConnectionInfo&) = default;
+#endif
+
     /**
      * The connection buffer receive size.
      */
-    Int rcvSize;
+    ::Ice::Int rcvSize;
     /**
      * The connection buffer send size.
      */
-    Int sndSize;
+    ::Ice::Int sndSize;
 };
 
 /// \cond INTERNAL
@@ -1566,7 +1591,7 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    UDPConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, Int localPort, const ::std::string& remoteAddress, Int remotePort, const ::std::string& mcastAddress, Int mcastPort, Int rcvSize, Int sndSize) :
+    UDPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort, const ::std::string& mcastAddress, ::Ice::Int mcastPort, ::Ice::Int rcvSize, ::Ice::Int sndSize) :
         ::Ice::IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
         mcastAddress(mcastAddress),
         mcastPort(mcastPort),
@@ -1575,6 +1600,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    UDPConnectionInfo(const UDPConnectionInfo&) = default;
+    UDPConnectionInfo& operator=(const UDPConnectionInfo&) = default;
+#endif
+
     /**
      * The multicast address.
      */
@@ -1582,15 +1612,15 @@ public:
     /**
      * The multicast port.
      */
-    Int mcastPort;
+    ::Ice::Int mcastPort;
     /**
      * The connection buffer receive size.
      */
-    Int rcvSize;
+    ::Ice::Int rcvSize;
     /**
      * The connection buffer send size.
      */
-    Int sndSize;
+    ::Ice::Int sndSize;
 };
 
 /// \cond INTERNAL
@@ -1629,16 +1659,21 @@ public:
      * @param connectionId The connection id.
      * @param headers The headers from the HTTP upgrade request.
      */
-    WSConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const HeaderDict& headers) :
+    WSConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::Ice::HeaderDict& headers) :
         ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId),
         headers(headers)
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    WSConnectionInfo(const WSConnectionInfo&) = default;
+    WSConnectionInfo& operator=(const WSConnectionInfo&) = default;
+#endif
+
     /**
      * The headers from the HTTP upgrade request.
      */
-    HeaderDict headers;
+    ::Ice::HeaderDict headers;
 };
 
 /// \cond INTERNAL

data/ext/ice/cpp/include/generated/Ice/ConnectionF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif