zeroc-ice 3.7.1 → 3.7.6

data/slice/Ice/CommunicatorF.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]

data/slice/Ice/Connection.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Identity.ice>
@@ -47,11 +53,12 @@ local enum CompressBatch
     BasedOnProxy
 }
 
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 /**
  *
- * Base class providing access to the connection details. *
+ * Base class providing access to the connection details.
+ *
  **/
-["php:internal", "matlab:internal"]
 local class ConnectionInfo
 {
     /**
@@ -84,6 +91,7 @@ local class ConnectionInfo
      **/
     string connectionId;
 }
+#endif
 
 local interface Connection;
 
@@ -106,7 +114,7 @@ local interface CloseCallback
      *
      * @param con The connection that closed.
      **/
-    void closed(Connection con);
+    ["swift:noexcept"] void closed(Connection con);
 }
 
 /**
@@ -127,7 +135,7 @@ local interface HeartbeatCallback
      *
      * @param con The connection on which a heartbeat was received.
      **/
-    void heartbeat(Connection con);
+    ["swift:noexcept"] void heartbeat(Connection con);
 }
 
 /**
@@ -203,12 +211,13 @@ local enum ConnectionClose
     GracefullyWithWait
 }
 
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 /**
  *
  * The user-level interface to a connection.
  *
  **/
-["php:internal", "matlab:internal"]
+["swift:inherits:Swift.CustomStringConvertible"]
 local interface Connection
 {
     /**
@@ -219,7 +228,7 @@ local interface Connection
      *
      * @see ConnectionClose
      **/
-    ["cpp:noexcept"] void close(ConnectionClose mode);
+    ["cpp:noexcept", "js:async"] void close(ConnectionClose mode);
 
     /**
      *
@@ -237,7 +246,7 @@ local interface Connection
      *
      * @see #setAdapter
      **/
-    ["cpp:const"] Object* createProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createProxy(Identity id);
 
     /**
      *
@@ -272,7 +281,7 @@ local interface Connection
      * @see #setAdapter
      *
      **/
-    ["cpp:const", "cpp:noexcept"] ObjectAdapter getAdapter();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] ObjectAdapter getAdapter();
 
     /**
      *
@@ -281,7 +290,7 @@ local interface Connection
      * @return The endpoint from which the connection was created.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] Endpoint getEndpoint();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"] Endpoint getEndpoint();
 
     /**
      *
@@ -316,7 +325,7 @@ local interface Connection
      * @param callback The heartbeat callback object.
      *
      **/
-    void setHeartbeatCallback(HeartbeatCallback callback);
+    ["swift:noexcept"] void setHeartbeatCallback(HeartbeatCallback callback);
 
     /**
      *
@@ -329,15 +338,14 @@ local interface Connection
      *
      * 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
      *
      **/
-    ["java:optional"]
+    ["swift:noexcept", "java:optional"]
     void setACM(optional(1) int timeout, optional(2) ACMClose close, optional(3) ACMHeartbeat heartbeat);
 
     /**
@@ -347,7 +355,7 @@ local interface Connection
      * @return The ACM parameters.
      *
      **/
-    ["cpp:noexcept"] ACM getACM();
+    ["cpp:noexcept", "swift:noexcept"] ACM getACM();
 
     /**
      *
@@ -357,7 +365,7 @@ local interface Connection
      * @return The type of the connection.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string type();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string type();
 
     /**
      *
@@ -366,7 +374,7 @@ local interface Connection
      * @return The connection's timeout.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] int timeout();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] int timeout();
 
     /**
      *
@@ -377,7 +385,7 @@ local interface Connection
      * text.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string toString();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string toString();
 
     /**
      *
@@ -386,7 +394,7 @@ local interface Connection
      * @return The connection information.
      *
      **/
-    ["cpp:const"] ConnectionInfo getInfo();
+    ["cpp:const", "swift:nonnull"] ConnectionInfo getInfo();
 
     /**
      *
@@ -415,7 +423,6 @@ local interface Connection
  * Provides access to the connection details of an IP connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class IPConnectionInfo extends ConnectionInfo
 {
     /** The local address. */
@@ -436,7 +443,6 @@ local class IPConnectionInfo extends ConnectionInfo
  * Provides access to the connection details of a TCP connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class TCPConnectionInfo extends IPConnectionInfo
 {
     /**
@@ -459,7 +465,6 @@ local class TCPConnectionInfo extends IPConnectionInfo
  * Provides access to the connection details of a UDP connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class UDPConnectionInfo extends IPConnectionInfo
 {
     /**
@@ -499,11 +504,12 @@ dictionary<string, string> HeaderDict;
  * Provides access to the connection details of a WebSocket connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class WSConnectionInfo extends ConnectionInfo
 {
     /** The headers from the HTTP upgrade request. */
     HeaderDict headers;
 }
 
+#endif
+
 }

data/slice/Ice/ConnectionF.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]

data/slice/Ice/Current.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/ConnectionF.ice>
@@ -26,9 +32,9 @@ module Ice
 
 /**
  *
- * A request context. <tt>Context</tt> is used to transmit metadata about a
+ * A request context. <code>Context</code> is used to transmit metadata about a
  * request from the server to the client, such as Quality-of-Service
- * (QoS) parameters. Each operation on the client has a <tt>Context</tt> as
+ * (QoS) parameters. Each operation on the client has a <code>Context</code> as
  * its implicit final parameter.
  *
  **/
@@ -46,37 +52,37 @@ dictionary<string, string> Context;
 enum OperationMode
 {
     /**
-     * Ordinary operations have <tt>Normal</tt> mode.  These operations
+     * Ordinary operations have <code>Normal</code> mode.  These operations
      * modify object state; invoking such an operation twice in a row
      * has different semantics than invoking it once. The Ice run time
      * guarantees that it will not violate at-most-once semantics for
-     * <tt>Normal</tt> operations.
+     * <code>Normal</code> operations.
      */
     Normal,
 
     /**
-     * Operations that use the Slice <tt>nonmutating</tt> keyword must not
+     * Operations that use the Slice <code>nonmutating</code> keyword must not
      * modify object state. For C++, nonmutating operations generate
-     * <tt>const</tt> member functions in the skeleton. In addition, the Ice
+     * <code>const</code> member functions in the skeleton. In addition, the Ice
      * run time will attempt to transparently recover from certain
      * run-time errors by re-issuing a failed request and propagate
      * the failure to the application only if the second attempt
      * fails.
      *
-     * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
-     * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
-     * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
-     * member functions, use the <tt>\["cpp:const"]</tt> metadata
+     * <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
+     * <code>idempotent</code> keyword instead. For C++, to retain the mapping
+     * of <code>nonmutating</code> operations to C++ <code>const</code>
+     * member functions, use the <code>\["cpp:const"]</code> metadata
      * directive.
      */
     \Nonmutating,
 
     /**
-     * Operations that use the Slice <tt>idempotent</tt> keyword can modify
+     * Operations that use the Slice <code>idempotent</code> keyword can modify
      * object state, but invoking an operation twice in a row must
      * result in the same object state as invoking it once.  For
-     * example, <tt>x = 1</tt> is an idempotent statement,
-     * whereas <tt>x += 1</tt> is not. For idempotent
+     * example, <code>x = 1</code> is an idempotent statement,
+     * whereas <code>x += 1</code> is not. For idempotent
      * operations, the Ice run-time uses the same retry behavior
      * as for nonmutating operations in case of a potentially
      * recoverable error.
@@ -87,8 +93,8 @@ enum OperationMode
 /**
  *
  * Information about the current method invocation for servers. Each
- * operation on the server has a <tt>Current</tt> as its implicit final
- * parameter. <tt>Current</tt> is mostly used for Ice services. Most
+ * operation on the server has a <code>Current</code> as its implicit final
+ * parameter. <code>Current</code> is mostly used for Ice services. Most
  * applications ignore this parameter.
  *
  **/
@@ -147,7 +153,7 @@ local struct Current
 
     /**
      *
-     * The request id unless oneway (0) or collocated (-1).
+     * The request id unless oneway (0).
      *
      **/
     int requestId;

data/slice/Ice/Endpoint.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/Version.ice>
 #include <Ice/BuiltinSequences.ice>
@@ -86,12 +92,12 @@ const short iAPEndpointType = 8;
  **/
 const short iAPSEndpointType = 9;
 
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 /**
  *
  * Base class providing access to the endpoint details.
  *
  **/
-["php:internal", "matlab:internal"]
 local class EndpointInfo
 {
     /**
@@ -125,7 +131,7 @@ local class EndpointInfo
      * @return The endpoint type.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] short type();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] short type();
 
     /**
      *
@@ -134,7 +140,7 @@ local class EndpointInfo
      * @return True for a datagram endpoint.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] bool datagram();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] bool datagram();
 
     /**
      *
@@ -143,7 +149,7 @@ local class EndpointInfo
      * @return True for a secure endpoint.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] bool secure();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] bool secure();
 }
 
 /**
@@ -151,7 +157,7 @@ local class EndpointInfo
  * The user-level interface to an endpoint.
  *
  **/
-["cpp:comparable", "php:internal", "matlab:internal"]
+["cpp:comparable", "js:comparable", "swift:inherits:Swift.CustomStringConvertible"]
 local interface Endpoint
 {
     /**
@@ -161,7 +167,7 @@ local interface Endpoint
      * @return The string representation of the endpoint.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string toString();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string toString();
 
     /**
      *
@@ -170,7 +176,7 @@ local interface Endpoint
      * @return The endpoint information class.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] EndpointInfo getInfo();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] EndpointInfo getInfo();
 }
 
 /**
@@ -180,7 +186,6 @@ local interface Endpoint
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class IPEndpointInfo extends EndpointInfo
 {
     /**
@@ -212,7 +217,6 @@ local class IPEndpointInfo extends EndpointInfo
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class TCPEndpointInfo extends IPEndpointInfo
 {
 }
@@ -224,7 +228,6 @@ local class TCPEndpointInfo extends IPEndpointInfo
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class UDPEndpointInfo extends IPEndpointInfo
 {
     /**
@@ -247,7 +250,6 @@ local class UDPEndpointInfo extends IPEndpointInfo
  * Provides access to a WebSocket endpoint information.
  *
  **/
-["php:internal", "matlab:internal"]
 local class WSEndpointInfo extends EndpointInfo
 {
     /**
@@ -265,7 +267,6 @@ local class WSEndpointInfo extends EndpointInfo
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class OpaqueEndpointInfo extends EndpointInfo
 {
     /**
@@ -284,4 +285,6 @@ local class OpaqueEndpointInfo extends EndpointInfo
     ByteSeq rawBytes;
 }
 
+#endif
+
 }