zeroc-ice 3.7.0 → 3.7.5

data/slice/Ice/Endpoint.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "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"]
 local class EndpointInfo
 {
     /**
@@ -125,7 +131,7 @@ local class EndpointInfo
      * @return The endpoint type.
      *
      **/
-    ["cpp:const"] 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"] 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"] 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"]
+["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"] string toString();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string toString();
 
     /**
      *
@@ -170,7 +176,7 @@ local interface Endpoint
      * @return The endpoint information class.
      *
      **/
-    ["cpp:const"] EndpointInfo getInfo();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] EndpointInfo getInfo();
 }
 
 /**
@@ -180,7 +186,6 @@ local interface Endpoint
  * @see Endpoint
  *
  **/
-["php:internal"]
 local class IPEndpointInfo extends EndpointInfo
 {
     /**
@@ -212,7 +217,6 @@ local class IPEndpointInfo extends EndpointInfo
  * @see Endpoint
  *
  **/
-["php:internal"]
 local class TCPEndpointInfo extends IPEndpointInfo
 {
 }
@@ -224,7 +228,6 @@ local class TCPEndpointInfo extends IPEndpointInfo
  * @see Endpoint
  *
  **/
-["php:internal"]
 local class UDPEndpointInfo extends IPEndpointInfo
 {
     /**
@@ -247,7 +250,6 @@ local class UDPEndpointInfo extends IPEndpointInfo
  * Provides access to a WebSocket endpoint information.
  *
  **/
-["php:internal"]
 local class WSEndpointInfo extends EndpointInfo
 {
     /**
@@ -265,7 +267,6 @@ local class WSEndpointInfo extends EndpointInfo
  * @see Endpoint
  *
  **/
-["php:internal"]
 local class OpaqueEndpointInfo extends EndpointInfo
 {
     /**
@@ -274,14 +275,16 @@ local class OpaqueEndpointInfo extends EndpointInfo
      * encode the rawBytes).
      *
      **/
-    Ice::EncodingVersion rawEncoding;
+    EncodingVersion rawEncoding;
 
     /**
      *
      * The raw encoding of the opaque endpoint.
      *
      **/
-    Ice::ByteSeq rawBytes;
+    ByteSeq rawBytes;
 }
 
+#endif
+
 }

data/slice/Ice/EndpointF.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "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"]]
@@ -31,6 +37,6 @@ local interface Endpoint;
  * A sequence of endpoints.
  *
  **/
-local sequence<Endpoint> EndpointSeq;
+["swift:nonnull"] local sequence<Endpoint> EndpointSeq;
 
 }

data/slice/Ice/EndpointTypes.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "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"]]
@@ -28,11 +34,11 @@ module Ice
 local enum EndpointSelectionType
 {
     /**
-     * <tt>Random</tt> causes the endpoints to be arranged in a random order.
+     * <code>Random</code> causes the endpoints to be arranged in a random order.
      */
     Random,
     /**
-     * <tt>Ordered</tt> forces the Ice run time to use the endpoints in the
+     * <code>Ordered</code> forces the Ice run time to use the endpoints in the
      * order they appeared in the proxy.
      */
     Ordered

data/slice/Ice/FacetMap.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "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"]]
@@ -24,6 +30,6 @@ module Ice
  * A mapping from facet name to servant.
  *
  **/
-local dictionary<string, Object> FacetMap;
+local dictionary<string, ["swift:nonnull"] Object> FacetMap;
 
 }

data/slice/Ice/Identity.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "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/ImplicitContext.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "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"]]
 
 #include <Ice/LocalException.ice>
 #include <Ice/Current.ice>
@@ -26,25 +32,25 @@ module Ice
  *
  * An interface to associate implict contexts with communicators.
  *
- * <p>When you make a remote invocation without an explicit context parameter,
- * Ice uses the per-proxy context (if any) combined with the <tt>ImplicitContext</tt>
- * associated with the communicator.</p>
+ * When you make a remote invocation without an explicit context parameter,
+ * Ice uses the per-proxy context (if any) combined with the <code>ImplicitContext</code>
+ * associated with the communicator.
  *
- * <p>Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
- * used depends on the value of the <tt>Ice.ImplicitContext</tt> property.
+ * Ice provides several implementations of <code>ImplicitContext</code>. The implementation
+ * used depends on the value of the <code>Ice.ImplicitContext</code> property.
  * <dl>
- * <dt><tt>None</tt> (default)</dt>
+ * <dt><code>None</code> (default)</dt>
  * <dd>No implicit context at all.</dd>
- * <dt><tt>PerThread</tt></dt>
+ * <dt><code>PerThread</code></dt>
  * <dd>The implementation maintains a context per thread.</dd>
- * <dt><tt>Shared</tt></dt>
+ * <dt><code>Shared</code></dt>
  * <dd>The implementation maintains a single context shared by all threads.</dd>
- * </dl><p>
+ * </dl>
  *
- * <tt>ImplicitContext</tt> also provides a number of operations to create, update or retrieve
+ * <code>ImplicitContext</code> also provides a number of operations to create, update or retrieve
  * an entry in the underlying context without first retrieving a copy of the entire
- * context. These operations correspond to a subset of the <tt>java.util.Map</tt> methods,
- * with <tt>java.lang.Object</tt> replaced by <tt>string</tt> and null replaced by the empty-string.
+ * context. These operations correspond to a subset of the <code>java.util.Map</code> methods,
+ * with <code>java.lang.Object</code> replaced by <code>string</code> and null replaced by the empty-string.
  *
  **/
 local interface ImplicitContext
@@ -54,7 +60,7 @@ local interface ImplicitContext
      * @return A copy of the underlying context.
      *
      **/
-    ["cpp:const"] Context getContext();
+    ["cpp:const", "swift:noexcept"] Context getContext();
 
     /**
      * Set the underlying context.
@@ -62,7 +68,7 @@ local interface ImplicitContext
      * @param newContext The new context.
      *
      **/
-    void setContext(Context newContext);
+    ["swift:noexcept"] void setContext(Context newContext);
 
     /**
      * Check if this key has an associated value in the underlying context.
@@ -72,7 +78,7 @@ local interface ImplicitContext
      * @return True if the key has an associated value, False otherwise.
      *
      **/
-    ["cpp:const"] bool containsKey(string key);
+    ["cpp:const", "swift:noexcept"] bool containsKey(string key);
 
     /**
      * Get the value associated with the given key in the underlying context.
@@ -85,7 +91,7 @@ local interface ImplicitContext
      * @return The value associated with the key.
      *
      **/
-    ["cpp:const"] string get(string key);
+    ["cpp:const", "swift:noexcept"] string get(string key);
 
     /**
      * Create or update a key/value entry in the underlying context.
@@ -97,7 +103,7 @@ local interface ImplicitContext
      * @return The previous value associated with the key, if any.
      *
      **/
-    string put(string key, string \value);
+    ["swift:noexcept"] string put(string key, string \value);
 
     /**
      * Remove the entry for the given key in the underlying context.
@@ -107,6 +113,6 @@ local interface ImplicitContext
      * @return The value associated with the key, if any.
      *
      **/
-    string remove(string key);
+    ["swift:noexcept"] string remove(string key);
 }
 }

data/slice/Ice/ImplicitContextF.ice

@@ -1,15 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["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"]]
+
+[["js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]

data/slice/Ice/Instrumentation.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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", "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"]]
 
 #include <Ice/EndpointF.ice>
 #include <Ice/ConnectionF.ice>
@@ -324,14 +330,14 @@ local interface InvocationObserver extends Observer
  *
  * The observer updater interface. This interface is implemented by
  * the Ice run-time and an instance of this interface is provided by
- * the Ice communicator on initialization to the {@link
- * CommunicatorObserver} object set with the communicator
- * initialization data. The Ice communicator calls {@link
- * CommunicatorObserver#setObserverUpdater} to provide the observer
+ * the Ice communicator on initialization to the
+ * {@link CommunicatorObserver} object set with the communicator
+ * initialization data. The Ice communicator calls
+ * {@link CommunicatorObserver#setObserverUpdater} to provide the observer
  * updater.
  *
- * This interface can be used by add-ins implementing the {@link
- * CommunicatorObserver} interface to update the observers of
+ * This interface can be used by add-ins implementing the
+ * {@link CommunicatorObserver} interface to update the observers of
  * connections and threads.
  *
  **/