zeroc-ice 3.7.0 → 3.7.5

data/slice/Ice/Plugin.ice

@@ -1,16 +1,22 @@
 
-// **********************************************************************
 //
-// 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/LoggerF.ice>
 #include <Ice/BuiltinSequences.ice>
@@ -23,6 +29,7 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
 /**
  *
  * A communicator plug-in. A plug-in generally adds a feature to a
@@ -63,7 +70,7 @@ local interface PluginManager
      * Initialize the configured plug-ins. The communicator automatically initializes
      * the plug-ins by default, but an application may need to interact directly with
      * a plug-in prior to initialization. In this case, the application must set
-     * <tt>Ice.InitPlugins=0</tt> and then invoke {@link #initializePlugins}
+     * <code>Ice.InitPlugins=0</code> and then invoke {@link #initializePlugins}
      * manually. The plug-ins are initialized in the order in which they are loaded.
      * If a plug-in raises an exception during initialization, the communicator
      * invokes destroy on the plug-ins that have already been initialized.
@@ -82,7 +89,7 @@ local interface PluginManager
      * @see #getPlugin
      *
      **/
-    StringSeq getPlugins();
+    ["cpp:noexcept", "swift:noexcept"] StringSeq getPlugins();
 
     /**
      *
@@ -115,7 +122,9 @@ local interface PluginManager
      * Called when the communicator is being destroyed.
      *
      **/
-    void destroy();
+    ["cpp:noexcept", "swift:noexcept"] void destroy();
 }
 
+#endif
+
 }

data/slice/Ice/PluginF.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"]]
@@ -19,7 +25,11 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
+
 local interface Plugin;
 local interface PluginManager;
 
+#endif
+
 }

data/slice/Ice/Process.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/ProcessF.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/Properties.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/PropertiesAdmin.ice>
 
@@ -21,6 +27,8 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
+
 /**
  *
  * A property set used to configure Ice and Ice applications.
@@ -29,7 +37,6 @@ module Ice
  * <em>application-name</em>\[.<em>category</em>\[.<em>sub-category</em>]].<em>name</em>.
  *
  **/
-["php:internal"]
 local interface Properties
 {
     /**
@@ -44,7 +51,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    string getProperty(string key);
+    ["cpp:noexcept", "swift:noexcept"] string getProperty(string key);
 
     /**
      *
@@ -61,7 +68,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    string getPropertyWithDefault(string key, string \value);
+    ["cpp:noexcept", "swift:noexcept"] string getPropertyWithDefault(string key, string \value);
 
     /**
      *
@@ -75,7 +82,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    int getPropertyAsInt(string key);
+    ["cpp:noexcept", "swift:noexcept"] int getPropertyAsInt(string key);
 
     /**
      *
@@ -93,7 +100,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    int getPropertyAsIntWithDefault(string key, int \value);
+    ["cpp:noexcept", "swift:noexcept"] int getPropertyAsIntWithDefault(string key, int \value);
 
      /**
      *
@@ -113,7 +120,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    StringSeq getPropertyAsList(string key);
+    ["cpp:noexcept", "swift:noexcept"] StringSeq getPropertyAsList(string key);
 
     /**
      *
@@ -136,7 +143,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    StringSeq getPropertyAsListWithDefault(string key, StringSeq \value);
+    ["cpp:noexcept", "swift:noexcept"] StringSeq getPropertyAsListWithDefault(string key, StringSeq \value);
 
     /**
      *
@@ -149,7 +156,7 @@ local interface Properties
      * @return The matching property set.
      *
      **/
-    PropertyDict getPropertiesForPrefix(string prefix);
+    ["cpp:noexcept", "swift:noexcept"] PropertyDict getPropertiesForPrefix(string prefix);
 
     /**
      *
@@ -162,30 +169,30 @@ local interface Properties
      * @see #getProperty
      *
      **/
-    void setProperty(string key, string \value);
+    ["swift:noexcept"] void setProperty(string key, string \value);
 
     /**
      *
      * Get a sequence of command-line options that is equivalent to
      * this property set. Each element of the returned sequence is
      * a command-line option of the form
-     * <tt>--<em>key</em>=<em>value</em></tt>.
+     * <code>--<em>key</em>=<em>value</em></code>.
      *
      * @return The command line options for this property set.
      *
      **/
-    StringSeq getCommandLineOptions();
+    ["cpp:noexcept", "swift:noexcept"] StringSeq getCommandLineOptions();
 
     /**
      *
      * Convert a sequence of command-line options into properties.
      * All options that begin with
-     * <tt>--<em>prefix</em>.</tt> are
+     * <code>--<em>prefix</em>.</code> are
      * converted into properties. If the prefix is empty, all options
-     * that begin with <tt>--</tt> are converted to properties.
+     * that begin with <code>--</code> are converted to properties.
      *
      * @param prefix The property prefix, or an empty string to
-     * convert all options starting with <tt>--</tt>.
+     * convert all options starting with <code>--</code>.
      *
      * @param options The command-line options.
      *
@@ -199,8 +206,8 @@ local interface Properties
      *
      * Convert a sequence of command-line options into properties.
      * All options that begin with one of the following prefixes
-     * are converted into properties: <tt>--Ice</tt>, <tt>--IceBox</tt>, <tt>--IceGrid</tt>,
-     * <tt>--IcePatch2</tt>, <tt>--IceSSL</tt>, <tt>--IceStorm</tt>, <tt>--Freeze</tt>, and <tt>--Glacier2</tt>.
+     * are converted into properties: <code>--Ice</code>, <code>--IceBox</code>, <code>--IceGrid</code>,
+     * <code>--IcePatch2</code>, <code>--IceSSL</code>, <code>--IceStorm</code>, <code>--Freeze</code>, and <code>--Glacier2</code>.
      *
      * @param options The command-line options.
      *
@@ -210,6 +217,7 @@ local interface Properties
      **/
     StringSeq parseIceCommandLineOptions(StringSeq options);
 
+#ifndef __SLICE2JS__
     /**
      *
      * Load properties from a file.
@@ -218,6 +226,7 @@ local interface Properties
      *
      **/
     void load(string file);
+#endif
 
     /**
      *
@@ -226,7 +235,9 @@ local interface Properties
      * @return A copy of this property set.
      *
      **/
-    Properties clone();
+    ["cpp:noexcept", "swift:noexcept", "swift:nonnull"] Properties clone();
 }
 
+#endif
+
 }

data/slice/Ice/PropertiesAdmin.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/BuiltinSequences.ice>
 

data/slice/Ice/PropertiesF.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/RemoteLogger.ice

@@ -1,19 +1,25 @@
-// **********************************************************************
 //
-// 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
 
 #include <Ice/BuiltinSequences.ice>
 
-[["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"]]
 [["cpp:include:list"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
+
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
@@ -122,37 +128,28 @@ interface RemoteLogger
 {
     /**
      *
-     * init is called by {@link LoggerAdmin#attachRemoteLogger} when a
-     * RemoteLogger proxy is attached.
+     * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
      *
-     * @param prefix The prefix of the associated local {@link Logger}
+     * @param prefix The prefix of the associated local Logger.
      *
      * @param logMessages Old log messages generated before "now".
      *
-     * @see LoggerAdmin#attachRemoteLogger
-     *
-     *
      **/
     void init(string prefix, LogMessageSeq logMessages);
 
     /**
      *
-     * Log a {@link LogMessage}. Note that log may be called by {@link LoggerAdmin}
-     * before {@link RemoteLogger#init}.
+     * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
      *
      * @param message The message to log.
      *
-     * @see Logger
-     *
      **/
     void log(LogMessage message);
 }
 
 /**
  *
- * An exception thrown by {@link LoggerAdmin#attachRemoteLogger} to report
- * that the provided {@link RemoteLogger} was previously attached to this
- * {@link LoggerAdmin}.
+ * Thrown when the provided RemoteLogger was previously attached to a LoggerAdmin.
  *
  **/
 exception RemoteLoggerAlreadyAttachedException
@@ -169,9 +166,8 @@ interface LoggerAdmin
 {
     /**
      *
-     * attachRemoteLogger is called to attach a {@link RemoteLogger} object to
-     * the local {@link Logger}.
-     * attachRemoteLogger calls init on the provided {@link RemoteLogger} proxy.
+     * Attaches a RemoteLogger object to the local logger.
+     * attachRemoteLogger calls init on the provided RemoteLogger proxy.
      *
      * @param prx A proxy to the remote logger.
      *
@@ -183,7 +179,7 @@ interface LoggerAdmin
      * An empty list means no filtering (send all trace categories).
      *
      * @param messageMax The maximum number of log messages (of all types) to be provided
-     * to {@link RemoteLogger#init}. A negative value requests all messages available.
+     * to init. A negative value requests all messages available.
      *
      * @throws RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
      * attached to this admin object.
@@ -195,8 +191,7 @@ interface LoggerAdmin
 
     /**
      *
-     * detachRemoteLogger is called to detach a {@link RemoteLogger} object from
-     * the local {@link Logger}.
+     * Detaches a RemoteLogger object from the local logger.
      *
      * @param prx A proxy to the remote logger.
      *
@@ -207,7 +202,7 @@ interface LoggerAdmin
 
     /**
      *
-     * getLog retrieves log messages recently logged.
+     * Retrieves log messages recently logged.
      *
      * @param messageTypes The list of message types that the caller wishes to receive.
      * An empty list means no filtering (send all message types).
@@ -219,7 +214,7 @@ interface LoggerAdmin
      * @param messageMax The maximum number of log messages (of all types) to be returned.
      * A negative value requests all messages available.
      *
-     * @param prefix The prefix of the associated local {@link Logger}.
+     * @param prefix The prefix of the associated local logger.
      *
      * @return The Log messages.
      *