zeroc-ice 3.7.1 → 3.7.6

data/slice/Ice/Locator.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/Identity.ice>
 #include <Ice/Process.ice>

data/slice/Ice/LocatorF.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/Logger.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"]]
@@ -34,7 +40,7 @@ local interface Logger
      *
      * @param message The message to log.
      **/
-    void print(string message);
+    ["swift:noexcept"] void print(string message);
 
     /**
      *
@@ -45,7 +51,7 @@ local interface Logger
      * @param message The trace message to log.
      *
      **/
-    void trace(string category, string message);
+    ["swift:noexcept"] void trace(string category, string message);
 
     /**
      *
@@ -56,7 +62,7 @@ local interface Logger
      * @see #error
      *
      **/
-    void warning(string message);
+    ["swift:noexcept"] void warning(string message);
 
     /**
      *
@@ -67,7 +73,7 @@ local interface Logger
      * @see #warning
      *
      **/
-    void error(string message);
+    ["swift:noexcept"] void error(string message);
 
     /**
      *
@@ -76,7 +82,7 @@ local interface Logger
      * @return The prefix.
      *
      **/
-    string getPrefix();
+    ["swift:noexcept"] string getPrefix();
 
     /**
      *
@@ -86,7 +92,7 @@ local interface Logger
      * @return A logger instance.
      *
      */
-    Logger cloneWithPrefix(string prefix);
+    ["swift:noexcept", "swift:nonnull"] Logger cloneWithPrefix(string prefix);
 }
 
 }

data/slice/Ice/LoggerF.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/Metrics.ice

@@ -1,30 +1,36 @@
-// **********************************************************************
 //
-// 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/BuiltinSequences.ice>
 
 /**
  *
- * The Ice Management eXtension facility. It provides the {@link
- * IceMX#MetricsAdmin} interface for management clients to retrieve
- * metrics from Ice applications.
+ * The Ice Management eXtension facility. It provides the
+ * {@link IceMX#MetricsAdmin} interface for management clients to
+ * retrieve metrics from Ice applications.
  *
  **/
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEMX"]
+["objc:prefix:ICEMX", "swift:module:Ice:MX"]
 module IceMX
 {
 
@@ -52,14 +58,16 @@ class Metrics
 
     /**
      *
-     * The total number of objects that were observed by this metrics.
+     * The total number of objects observed by this metrics. This includes
+     * the number of currently observed objects and the number of objects
+     * observed in the past.
      *
      **/
     long total = 0;
 
     /**
      *
-     * The current number of objects observed by this metrics.
+     * The number of objects currently observed by this metrics.
      *
      **/
     int current = 0;
@@ -67,7 +75,8 @@ class Metrics
     /**
      *
      * The sum of the lifetime of each observed objects. This does not
-     * include the lifetime of objects which are currently observed.
+     * include the lifetime of objects which are currently observed,
+     * only the objects observed in the past.
      *
      **/
     long totalLifetime = 0;
@@ -316,8 +325,8 @@ class DispatchMetrics extends Metrics
  * Provides information on child invocations. A child invocation is
  * either remote (sent over an Ice connection) or collocated. An
  * invocation can have multiple child invocation if it is
- * retried. Child invocation metrics are embedded within {@link
- * InvocationMetrics}.
+ * retried. Child invocation metrics are embedded within
+ * {@link InvocationMetrics}.
  *
  **/
 class ChildInvocationMetrics extends Metrics
@@ -352,8 +361,7 @@ class CollocatedMetrics extends ChildInvocationMetrics
 /**
  *
  * Provides information on invocations that are specifically sent over
- * Ice connections. Remote metrics are embedded within {@link
- * InvocationMetrics}.
+ * Ice connections. Remote metrics are embedded within {@link InvocationMetrics}.
  *
  **/
 class RemoteMetrics extends ChildInvocationMetrics

data/slice/Ice/ObjectAdapter.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"]]
 
 #include <Ice/CommunicatorF.ice>
 #include <Ice/ServantLocatorF.ice>
@@ -48,7 +54,7 @@ local interface ObjectAdapter
      * @return This object adapter's name.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string getName();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string getName();
 
     /**
      *
@@ -59,7 +65,7 @@ local interface ObjectAdapter
      * @see Communicator
      *
      **/
-    ["cpp:const", "cpp:noexcept"] Communicator getCommunicator();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"] Communicator getCommunicator();
 
     /**
      *
@@ -71,7 +77,7 @@ local interface ObjectAdapter
      * @see #deactivate
      *
      **/
-    void activate();
+    ["js:async"] void activate();
 
     /**
      *
@@ -88,7 +94,7 @@ local interface ObjectAdapter
      * @see #waitForHold
      *
      **/
-    void hold();
+    ["swift:noexcept"] void hold();
 
     /**
      *
@@ -101,7 +107,7 @@ local interface ObjectAdapter
      * @see Communicator#waitForShutdown
      *
      **/
-    void waitForHold();
+    ["swift:noexcept", "js:async"] void waitForHold();
 
     /**
      *
@@ -128,7 +134,7 @@ local interface ObjectAdapter
      * @see Communicator#shutdown
      *
      **/
-    ["cpp:noexcept"] void deactivate();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void deactivate();
 
     /**
      *
@@ -142,7 +148,7 @@ local interface ObjectAdapter
      * @see Communicator#waitForShutdown
      *
      **/
-    ["cpp:noexcept"] void waitForDeactivate();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void waitForDeactivate();
 
     /**
      *
@@ -153,7 +159,7 @@ local interface ObjectAdapter
      * @see Communicator#shutdown
      *
      **/
-    ["cpp:const", "cpp:noexcept"] bool isDeactivated();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] bool isDeactivated();
 
     /**
      *
@@ -169,7 +175,7 @@ local interface ObjectAdapter
      * @see Communicator#destroy
      *
      **/
-    ["cpp:noexcept"] void destroy();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void destroy();
 
     /**
      *
@@ -193,11 +199,12 @@ local interface ObjectAdapter
      * @see #find
      *
      **/
-    Object* add(Object servant, ["objc:param:identity"] Identity id);
+    ["swift:nonnull", "swift:attribute:@discardableResult"]
+    Object* add(["swift:nonnull"] Object servant, ["objc:param:identity"] Identity id);
 
     /**
      *
-     * Like {@link #add}, but with a facet. Calling <tt>add(servant, id)</tt>
+     * Like {@link #add}, but with a facet. Calling <code>add(servant, id)</code>
      * is equivalent to calling {@link #addFacet} with an empty facet.
      *
      * @param servant The servant to add.
@@ -217,14 +224,15 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    Object* addFacet(Object servant, ["objc:param:identity"] Identity id, string facet);
+    ["swift:nonnull", "swift:attribute:@discardableResult"]
+    Object* addFacet(["swift:nonnull"] Object servant, ["objc:param:identity"] Identity id, string facet);
 
     /**
      *
      * Add a servant to this object adapter's Active Servant Map,
      * using an automatically generated UUID as its identity. Note that
      * the generated UUID identity can be accessed using the proxy's
-     * <tt>ice_getIdentity</tt> operation.
+     * <code>ice_getIdentity</code> operation.
      *
      * @param servant The servant to add.
      *
@@ -238,12 +246,12 @@ local interface ObjectAdapter
      * @see #find
      *
      **/
-    Object* addWithUUID(Object servant);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object* addWithUUID(["swift:nonnull"] Object servant);
 
     /**
      *
      * Like {@link #addWithUUID}, but with a facet. Calling
-     * <tt>addWithUUID(servant)</tt> is equivalent to calling
+     * <code>addWithUUID(servant)</code> is equivalent to calling
      * {@link #addFacetWithUUID} with an empty facet.
      *
      * @param servant The servant to add.
@@ -261,7 +269,7 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    Object* addFacetWithUUID(Object servant, string facet);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object* addFacetWithUUID(["swift:nonnull"] Object servant, string facet);
 
     /**
      *
@@ -301,7 +309,7 @@ local interface ObjectAdapter
      * @see #findDefaultServant
      *
      **/
-    void addDefaultServant(Object servant, string category);
+    void addDefaultServant(["swift:nonnull"] Object servant, string category);
 
     /**
      *
@@ -321,11 +329,11 @@ local interface ObjectAdapter
      * @see #addWithUUID
      *
      **/
-    Object remove(Identity id);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object remove(Identity id);
 
     /**
      *
-     * Like {@link #remove}, but with a facet. Calling <tt>remove(id)</tt>
+     * Like {@link #remove}, but with a facet. Calling <code>remove(id)</code>
      * is equivalent to calling {@link #removeFacet} with an empty facet.
      *
      * @param id The identity of the Ice object that is implemented by
@@ -340,7 +348,7 @@ local interface ObjectAdapter
      * @see #addFacetWithUUID
      *
      **/
-    Object removeFacet(Identity id, string facet);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object removeFacet(Identity id, string facet);
 
     /**
      *
@@ -358,7 +366,7 @@ local interface ObjectAdapter
      * @see #removeFacet
      *
      **/
-    FacetMap removeAllFacets(Identity id);
+    ["swift:attribute:@discardableResult"] FacetMap removeAllFacets(Identity id);
 
     /**
      *
@@ -374,7 +382,7 @@ local interface ObjectAdapter
      * @see #findDefaultServant
      *
      **/
-    Object removeDefaultServant(string category);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object removeDefaultServant(string category);
 
     /**
      *
@@ -396,11 +404,11 @@ local interface ObjectAdapter
      * @see #findByProxy
      *
      **/
-    ["cpp:const"] Object find(Identity id);
+    ["swift:noexcept", "cpp:const"] Object find(Identity id);
 
     /**
      *
-     * Like {@link #find}, but with a facet. Calling <tt>find(id)</tt>
+     * Like {@link #find}, but with a facet. Calling <code>find(id)</code>
      * is equivalent to calling {@link #findFacet} with an empty
      * facet.
      *
@@ -419,7 +427,7 @@ local interface ObjectAdapter
      * @see #findByProxy
      *
      **/
-    ["cpp:const"] Object findFacet(Identity id, string facet);
+    ["swift:noexcept", "cpp:const"] Object findFacet(Identity id, string facet);
 
     /**
      *
@@ -437,7 +445,7 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    ["cpp:const"] FacetMap findAllFacets(Identity id);
+    ["swift:noexcept", "cpp:const"] FacetMap findAllFacets(Identity id);
 
     /**
      *
@@ -457,7 +465,7 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    ["cpp:const"] Object findByProxy(Object* proxy);
+    ["swift:noexcept", "cpp:const"] Object findByProxy(["swift:nonnull"] Object* proxy);
 
     /**
      *
@@ -505,7 +513,7 @@ local interface ObjectAdapter
      * @see ServantLocator
      *
      **/
-    void addServantLocator(ServantLocator locator, string category);
+    void addServantLocator(["swift:nonnull"] ServantLocator locator, string category);
 
     /**
      *
@@ -524,7 +532,7 @@ local interface ObjectAdapter
      * @see ServantLocator
      *
      **/
-    ServantLocator removeServantLocator(string category);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] ServantLocator removeServantLocator(string category);
 
     /**
      *
@@ -543,7 +551,7 @@ local interface ObjectAdapter
      * @see ServantLocator
      *
      **/
-    ["cpp:const"] ServantLocator findServantLocator(string category);
+    ["swift:noexcept", "cpp:const"] ServantLocator findServantLocator(string category);
 
     /**
      *
@@ -558,7 +566,7 @@ local interface ObjectAdapter
      * @see #removeDefaultServant
      *
      **/
-    ["cpp:const"] Object findDefaultServant(string category);
+    ["swift:noexcept", "cpp:const"] Object findDefaultServant(string category);
 
     /**
      *
@@ -577,7 +585,7 @@ local interface ObjectAdapter
      * @see Identity
      *
      **/
-    ["cpp:const"] Object* createProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createProxy(Identity id);
 
     /**
      *
@@ -592,7 +600,7 @@ local interface ObjectAdapter
      * @see Identity
      *
      **/
-    ["cpp:const"] Object* createDirectProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createDirectProxy(Identity id);
 
     /**
      *
@@ -608,7 +616,7 @@ local interface ObjectAdapter
      * @see Identity
      *
      **/
-    ["cpp:const"] Object* createIndirectProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createIndirectProxy(Identity id);
 
     /**
      * Set an Ice locator for this object adapter. By doing so, the
@@ -637,7 +645,7 @@ local interface ObjectAdapter
      * @see #setLocator
      *
      **/
-    ["cpp:const", "cpp:noexcept"] Locator* getLocator();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] Locator* getLocator();
 
     /**
      *
@@ -648,7 +656,7 @@ local interface ObjectAdapter
      * @see Endpoint
      *
      **/
-    ["cpp:const", "cpp:noexcept"] EndpointSeq getEndpoints();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] EndpointSeq getEndpoints();
 
     /**
      * Refresh the set of published endpoints. The run time re-reads
@@ -659,7 +667,7 @@ local interface ObjectAdapter
      * an object adapter if the network interfaces used by a host changes.
      *
      **/
-    void refreshPublishedEndpoints();
+    ["js:async"] void refreshPublishedEndpoints();
 
     /**
      *
@@ -672,7 +680,7 @@ local interface ObjectAdapter
      * @see Endpoint
      *
      **/
-    ["cpp:const", "cpp:noexcept"] EndpointSeq getPublishedEndpoints();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] EndpointSeq getPublishedEndpoints();
 
     /**
      *
@@ -686,6 +694,16 @@ local interface ObjectAdapter
      *
      **/
     void setPublishedEndpoints(EndpointSeq newEndpoints);
+
+#if defined(__SLICE2SWIFT__) || defined(ICE_SWIFT)
+    /*
+     * Returns the dispatch queue.
+     *
+     * @return The dispatch queue associated wih this Object Adapter.
+     **/
+    ["cpp:const", "swift:nonnull", "cpp:type:dispatch_queue_t", "swift:type:Dispatch.DispatchQueue"]
+    LocalObject getDispatchQueue();
+#endif
 }
 
 }