zeroc-ice 3.7.0 → 3.7.5

data/slice/Ice/InstrumentationF.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"]]

data/slice/Ice/LocalException.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/Identity.ice>
 #include <Ice/Version.ice>
@@ -83,9 +89,9 @@ local exception AlreadyRegisteredException
 {
     /**
      *
-     * The kind of object that is registered already: "servant",
-     * "servant locator", "value factory", "plug-in",
-     * "object adapter", "object", or "user exception factory".
+     * The kind of object that could not be removed: "servant", "facet",
+     * "object", "default servant", "servant locator", "value factory", "plugin",
+     * "object adapter", "object adapter with router", "replica group".
      *
      **/
     string kindOfObject;
@@ -117,9 +123,9 @@ local exception NotRegisteredException
 {
     /**
      *
-     * The kind of object that could not be removed: "servant",
-     * "servant locator", "value factory", "plug-in",
-     * "object adapter", "object", or "user exception factory".
+     * The kind of object that could not be removed: "servant", "facet",
+     * "object", "default servant", "servant locator", "value factory", "plugin",
+     * "object adapter", "object adapter with router", "replica group".
      *
      **/
     string kindOfObject;
@@ -137,8 +143,8 @@ local exception NotRegisteredException
  * The operation can only be invoked with a twoway request.
  *
  * This exception is raised if an attempt is made to invoke an
- * operation with <tt>ice_oneway</tt>, <tt>ice_batchOneway</tt>, <tt>ice_datagram</tt>,
- * or <tt>ice_batchDatagram</tt> and the operation has a return value,
+ * operation with <code>ice_oneway</code>, <code>ice_batchOneway</code>, <code>ice_datagram</code>,
+ * or <code>ice_batchDatagram</code> and the operation has a return value,
  * out-parameters, or an exception specification.
  *
  **/
@@ -158,10 +164,10 @@ local exception TwowayOnlyException
  * An attempt was made to clone a class that does not support
  * cloning.
  *
- * This exception is raised if <tt>ice_clone</tt> is called on
+ * This exception is raised if <code>ice_clone</code> is called on
  * a class that is derived from an abstract Slice class (that is,
  * a class containing operations), and the derived class does not
- * provide an implementation of the <tt>ice_clone</tt> operation (C++ only).
+ * provide an implementation of the <code>ice_clone</code> operation (C++ only).
  *
  **/
 ["cpp:ice_print"]
@@ -174,8 +180,8 @@ local exception CloneNotImplementedException
  * This exception is raised if an operation call on a server raises an
  * unknown exception. For example, for C++, this exception is raised
  * if the server throws a C++ exception that is not directly or
- * indirectly derived from <tt>Ice::LocalException</tt> or
- * <tt>Ice::UserException</tt>.
+ * indirectly derived from <code>Ice::LocalException</code> or
+ * <code>Ice::UserException</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -198,7 +204,7 @@ local exception UnknownException
  * by the server as {@link UnknownLocalException}. The only exception to this
  * rule are all exceptions derived from {@link RequestFailedException},
  * which are transmitted by the Ice protocol even though they are
- * declared <tt>local</tt>.
+ * declared <code>local</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -212,13 +218,13 @@ local exception UnknownLocalException extends UnknownException
  *
  * This exception is raised if an operation raises a
  * user exception that is not declared in the exception's
- * <tt>throws</tt> clause. Such undeclared exceptions are
+ * <code>throws</code> clause. Such undeclared exceptions are
  * not transmitted from the server to the client by the Ice
  * protocol, but instead the client just gets an
  * {@link UnknownUserException}. This is necessary in order to not violate
  * the contract established by an operation's signature: Only local
  * exceptions and user exceptions declared in the
- * <tt>throws</tt> clause can be raised.
+ * <code>throws</code> clause can be raised.
  *
  **/
 ["cpp:ice_print"]
@@ -428,7 +434,7 @@ local exception IllegalServantException
  * This exception is raised if a request failed. This exception, and
  * all exceptions derived from {@link RequestFailedException}, are
  * transmitted by the Ice protocol, even though they are declared
- * <tt>local</tt>.
+ * <code>local</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -492,10 +498,10 @@ local exception SyscallException
     /**
      *
      * The error number describing the system exception. For C++ and
-     * Unix, this is equivalent to <tt>errno</tt>. For C++
+     * Unix, this is equivalent to <code>errno</code>. For C++
      * and Windows, this is the value returned by
-     * <tt>GetLastError()</tt> or
-     * <tt>WSAGetLastError()</tt>.
+     * <code>GetLastError()</code> or
+     * <code>WSAGetLastError()</code>.
      *
      **/
     int error = 0; // Don't use errno, as errno is usually a macro.
@@ -582,9 +588,9 @@ local exception DNSException
     /**
      *
      * The error number describing the DNS problem. For C++ and Unix,
-     * this is equivalent to <tt>h_errno</tt>. For C++ and
+     * this is equivalent to <code>h_errno</code>. For C++ and
      * Windows, this is the value returned by
-     * <tt>WSAGetLastError()</tt>.
+     * <code>WSAGetLastError()</code>.
      *
      **/
     int error = 0; // Don't use h_errno, as h_errno is usually a macro.
@@ -944,7 +950,7 @@ local exception UnexpectedObjectException extends MarshalException
  *
  * This exception is raised when Ice receives a request or reply
  * message whose size exceeds the limit specified by the
- * <tt>Ice.MessageSizeMax</tt> property.
+ * <code>Ice.MessageSizeMax</code> property.
  *
  **/
 ["cpp:ice_print"]

data/slice/Ice/Locator.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/Identity.ice>
 #include <Ice/Process.ice>
@@ -99,7 +105,7 @@ interface Locator
      * be found.
      *
      **/
-    ["amd", "nonmutating", "cpp:const"] idempotent Object* findObjectById(Ice::Identity id)
+    ["amd", "nonmutating", "cpp:const"] idempotent Object* findObjectById(Identity id)
         throws ObjectNotFoundException;
 
     /**

data/slice/Ice/LocatorF.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"]]

data/slice/Ice/Logger.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"]]
@@ -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-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"]]

data/slice/Ice/Metrics.ice

@@ -1,30 +1,36 @@
-// **********************************************************************
 //
-// 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/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