zeroc-ice 3.7.0 → 3.7.5

data/slice/IceGrid/Descriptor.ice

@@ -1,21 +1,26 @@
-// **********************************************************************
 //
-// 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", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
+[["cpp:include:IceGrid/Config.h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
-[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
-#endif
+[["cpp:dll-export:ICEGRID_API"]]
 
-[["cpp:include:IceGrid/Config.h"]]
+[["objc:dll-export:ICEGRID_API"]]
+#endif
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>

data/slice/IceGrid/Exception.ice

@@ -1,21 +1,26 @@
-// **********************************************************************
 //
-// 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", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
+[["cpp:include:IceGrid/Config.h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
-[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
-#endif
+[["cpp:dll-export:ICEGRID_API"]]
 
-[["cpp:include:IceGrid/Config.h"]]
+[["objc:dll-export:ICEGRID_API"]]
+#endif
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>

data/slice/IceGrid/FileParser.ice

@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// 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:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <IceGrid/Admin.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
@@ -35,7 +41,7 @@ exception ParseException
 
 /**
  *
- * <tt>icegridadmin</tt> provides a {@link FileParser}
+ * <code>icegridadmin</code> provides a {@link FileParser}
  * object to transform XML files into {@link ApplicationDescriptor}
  * objects.
  *

data/slice/IceGrid/PluginFacade.ice

@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// 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:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Current.ice>
 
@@ -279,7 +285,7 @@ local interface RegistryPluginFacade
      * @param filter The filter implementation.
      *
      **/
-    void addReplicaGroupFilter(string id, ReplicaGroupFilter filter);
+    ["cpp:noexcept", "swift:noexcept"] void addReplicaGroupFilter(string id, ReplicaGroupFilter filter);
 
     /**
      *
@@ -292,7 +298,7 @@ local interface RegistryPluginFacade
      * @return True of the filter was removed, false otherwise.
      *
      **/
-    bool removeReplicaGroupFilter(string id, ReplicaGroupFilter filter);
+    ["cpp:noexcept", "swift:noexcept"] bool removeReplicaGroupFilter(string id, ReplicaGroupFilter filter);
 
     /**
      *
@@ -303,7 +309,7 @@ local interface RegistryPluginFacade
      * @param filter The filter implementation.
      *
      **/
-    void addTypeFilter(string type, TypeFilter filter);
+    ["cpp:noexcept", "swift:noexcept"] void addTypeFilter(string type, TypeFilter filter);
 
     /**
      *
@@ -316,7 +322,7 @@ local interface RegistryPluginFacade
      * @return True of the filter was removed, false otherwise.
      *
      **/
-    bool removeTypeFilter(string type, TypeFilter filter);
+    ["cpp:noexcept", "swift:noexcept"] bool removeTypeFilter(string type, TypeFilter filter);
 }
 
 }

data/slice/IceGrid/Registry.ice

@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// 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:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <IceGrid/Exception.ice>
 #include <IceGrid/Session.ice>
 #include <IceGrid/Admin.ice>

data/slice/IceGrid/Session.ice

@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// 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:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <Glacier2/Session.ice>
 #include <IceGrid/Exception.ice>
 
@@ -27,7 +33,7 @@ module IceGrid
  *
  * A session object is used by IceGrid clients to allocate and
  * release objects. Client sessions are created either via the
- * {@link Registry} object or via the registry client <tt>SessionManager</tt>
+ * {@link Registry} object or via the registry client <code>SessionManager</code>
  * object.
  *
  * @see Registry
@@ -89,8 +95,8 @@ interface Session extends Glacier2::Session
 
     /**
      *
-     * Release an object that was allocated using <tt>allocateObjectById</tt> or
-     * <tt>allocateObjectByType</tt>.
+     * Release an object that was allocated using <code>allocateObjectById</code> or
+     * <code>allocateObjectByType</code>.
      *
      * @param id The identity of the object to release.
      *
@@ -108,8 +114,8 @@ interface Session extends Glacier2::Session
     /**
      *
      * Set the allocation timeout. If no objects are available for an
-     * allocation request, a call to <tt>allocateObjectById</tt> or
-     * <tt>allocateObjectByType</tt> will block for the duration of this
+     * allocation request, a call to <code>allocateObjectById</code> or
+     * <code>allocateObjectByType</code> will block for the duration of this
      * timeout.
      *
      * @param timeout The timeout in milliseconds.

data/slice/IceGrid/UserAccountMapper.ice

@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// 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:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
@@ -44,10 +50,10 @@ interface UserAccountMapper
      * used by IceGrid nodes to figure out the user account to use
      * to run servers.
      *
-     * @param user The value of the server descriptor's <tt>user</tt>
+     * @param user The value of the server descriptor's <code>user</code>
      * attribute. If this attribute is not defined, and the server's
-     * activation mode is <tt>session</tt>, the default value of
-     * <tt>user</tt> is the session identifier.
+     * activation mode is <code>session</code>, the default value of
+     * <code>user</code> is the session identifier.
      *
      * @return The user account name.
      *

data/slice/IceIAP/ConnectionInfo.ice

@@ -1,19 +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:ICEIAP_API", "objc:header-dir:objc", "js:ice-build"]]
+[["cpp:dll-export:ICEIAP_API"]]
+[["cpp:doxygen:include:IceIAP/IceIAP.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
 
 #include <Ice/Connection.ice>
 
-["objc:prefix:ICEIAP"]
+["objc:prefix:ICEIAP", "swift:module:Ice:IAP"]
 module IceIAP
 {
 

data/slice/IceIAP/EndpointInfo.ice

@@ -1,15 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2017-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:ICEIAP_API", "objc:header-dir:objc", "js:ice-build"]]
+[["cpp:dll-export:ICEIAP_API"]]
+[["cpp:doxygen:include:IceIAP/IceIAP.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
 
 #include <Ice/Endpoint.ice>
 
@@ -18,7 +21,7 @@
  * IceIAP provides a secure transport for Ice.
  *
  **/
-["objc:prefix:ICEIAP"]
+["objc:prefix:ICEIAP", "swift:module:Ice:IAP"]
 module IceIAP
 {
 

data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice

@@ -1,14 +1,19 @@
-// **********************************************************************
 //
-// 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", "objc:header-dir:objc", "python:pkgdir:IceLocatorDiscovery"]]
+
+[["cpp:doxygen:include:IceLocatorDiscovery/IceLocatorDiscovery.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceLocatorDiscovery"]]
 
 #include <Ice/Locator.ice>
 

data/slice/IcePatch2/FileInfo.ice

@@ -1,17 +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:ICEPATCH2_API", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
+[["cpp:dll-export:ICEPATCH2_API"]]
+[["cpp:doxygen:include:IcePatch2/IcePatch2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IcePatch2"]]
+
 #include <Ice/BuiltinSequences.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__

data/slice/IcePatch2/FileServer.ice

@@ -1,17 +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:ICEPATCH2_API", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
+[["cpp:dll-export:ICEPATCH2_API"]]
+[["cpp:doxygen:include:IcePatch2/IcePatch2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IcePatch2"]]
+
 #include <IcePatch2/FileInfo.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
@@ -39,7 +44,7 @@ sequence<Ice::ByteSeq> ByteSeqSeq;
 
 /**
  *
- * A <tt>partition</tt> argument was not in the range 0-255.
+ * A <code>partition</code> argument was not in the range 0-255.
  *
  **/
 exception PartitionOutOfRangeException