zeroc-ice 3.6.5 → 3.7.0

data/slice/Ice/ConnectionF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,7 +9,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["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"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -19,5 +23,4 @@ local class ConnectionInfo;
 local class WSConnectionInfo;
 local interface Connection;
 
-};
-
+}

data/slice/Ice/Current.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,13 +9,17 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["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"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/ConnectionF.ice>
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -32,7 +36,8 @@ dictionary<string, string> Context;
 
 /**
  *
- * Determines the retry behavior of an invocation in case of a (potentially) recoverable error.
+ * The {@link OperationMode} determines the retry behavior an
+ * invocation in case of a (potentially) recoverable error.
  *
  **/
 //
@@ -59,7 +64,7 @@ enum OperationMode
      * the failure to the application only if the second attempt
      * fails.
      *
-     * <tt>Nonmutating</tt> is deprecated; Use the
+     * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
      * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
      * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
      * member functions, use the <tt>\["cpp:const"]</tt> metadata
@@ -78,7 +83,7 @@ enum OperationMode
      * recoverable error.
      */
     \Idempotent
-};
+}
 
 /**
  *
@@ -153,8 +158,7 @@ local struct Current
      * The encoding version used to encode the input and output parameters.
      *
      **/
-    EncodingVersion encoding;
-};
-
-};
+    Ice::EncodingVersion encoding;
+}
 
+}

data/slice/Ice/Endpoint.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,11 +9,15 @@
 
 #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"]]
+
 #include <Ice/Version.ice>
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/EndpointF.ice>
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -54,13 +58,50 @@ const short WSEndpointType = 4;
  **/
 const short WSSEndpointType = 5;
 
+/**
+ *
+ * Uniquely identifies Bluetooth endpoints.
+ *
+ **/
+const short BTEndpointType = 6;
+
+/**
+ *
+ * Uniquely identifies SSL Bluetooth endpoints.
+ *
+ **/
+const short BTSEndpointType = 7;
+
+/**
+ *
+ * Uniquely identifies iAP-based endpoints.
+ *
+ **/
+const short iAPEndpointType = 8;
+
+/**
+ *
+ * Uniquely identifies SSL iAP-based endpoints.
+ *
+ **/
+const short iAPSEndpointType = 9;
+
 /**
  *
  * Base class providing access to the endpoint details.
  *
  **/
+["php:internal"]
 local class EndpointInfo
 {
+    /**
+     *
+     * The information of the underyling endpoint of null if there's
+     * no underlying endpoint.
+     *
+     **/
+    EndpointInfo underlying;
+
     /**
      *
      * The timeout for the endpoint in milliseconds. 0 means
@@ -82,6 +123,7 @@ local class EndpointInfo
      * Returns the type of the endpoint.
      *
      * @return The endpoint type.
+     *
      **/
     ["cpp:const"] short type();
 
@@ -90,6 +132,7 @@ local class EndpointInfo
      * Returns true if this endpoint is a datagram endpoint.
      *
      * @return True for a datagram endpoint.
+     *
      **/
     ["cpp:const"] bool datagram();
 
@@ -98,15 +141,17 @@ local class EndpointInfo
      * Returns true if this endpoint is a secure endpoint.
      *
      * @return True for a secure endpoint.
+     *
      **/
     ["cpp:const"] bool secure();
-};
+}
 
 /**
  *
  * The user-level interface to an endpoint.
  *
  **/
+["cpp:comparable", "php:internal"]
 local interface Endpoint
 {
     /**
@@ -126,7 +171,7 @@ local interface Endpoint
      *
      **/
     ["cpp:const"] EndpointInfo getInfo();
-};
+}
 
 /**
  *
@@ -135,6 +180,7 @@ local interface Endpoint
  * @see Endpoint
  *
  **/
+["php:internal"]
 local class IPEndpointInfo extends EndpointInfo
 {
     /**
@@ -157,7 +203,7 @@ local class IPEndpointInfo extends EndpointInfo
      *
      */
     string sourceAddress;
-};
+}
 
 /**
  *
@@ -166,9 +212,10 @@ local class IPEndpointInfo extends EndpointInfo
  * @see Endpoint
  *
  **/
+["php:internal"]
 local class TCPEndpointInfo extends IPEndpointInfo
 {
-};
+}
 
 /**
  *
@@ -177,6 +224,7 @@ local class TCPEndpointInfo extends IPEndpointInfo
  * @see Endpoint
  *
  **/
+["php:internal"]
 local class UDPEndpointInfo extends IPEndpointInfo
 {
     /**
@@ -192,14 +240,15 @@ local class UDPEndpointInfo extends IPEndpointInfo
      *
      **/
      int mcastTtl;
-};
+}
 
 /**
  *
  * Provides access to a WebSocket endpoint information.
  *
  **/
-local class WSEndpointInfo extends TCPEndpointInfo
+["php:internal"]
+local class WSEndpointInfo extends EndpointInfo
 {
     /**
      *
@@ -207,7 +256,7 @@ local class WSEndpointInfo extends TCPEndpointInfo
      *
      **/
     string resource;
-};
+}
 
 /**
  *
@@ -216,6 +265,7 @@ local class WSEndpointInfo extends TCPEndpointInfo
  * @see Endpoint
  *
  **/
+["php:internal"]
 local class OpaqueEndpointInfo extends EndpointInfo
 {
     /**
@@ -224,15 +274,14 @@ local class OpaqueEndpointInfo extends EndpointInfo
      * encode the rawBytes).
      *
      **/
-    EncodingVersion rawEncoding;
+    Ice::EncodingVersion rawEncoding;
 
     /**
      *
      * The raw encoding of the opaque endpoint.
      *
      **/
-    ByteSeq rawBytes;
-};
-
-};
+    Ice::ByteSeq rawBytes;
+}
 
+}

data/slice/Ice/EndpointF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,7 +9,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["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"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -29,5 +33,4 @@ local interface Endpoint;
  **/
 local sequence<Endpoint> EndpointSeq;
 
-};
-
+}

data/slice/Ice/EndpointTypes.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,8 +9,11 @@
 
 #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:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -22,7 +25,7 @@ module Ice
  * in a proxy when establishing a connection.
  *
  **/
-enum EndpointSelectionType
+local enum EndpointSelectionType
 {
     /**
      * <tt>Random</tt> causes the endpoints to be arranged in a random order.
@@ -33,7 +36,6 @@ enum EndpointSelectionType
      * order they appeared in the proxy.
      */
     Ordered
-};
-
-};
+}
 
+}

data/slice/Ice/FacetMap.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,7 +9,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -22,5 +26,4 @@ module Ice
  **/
 local dictionary<string, Object> FacetMap;
 
-};
-
+}

data/slice/Ice/Identity.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,7 +9,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["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"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -40,14 +44,19 @@ struct Identity
      *
      **/
     string category;
-};
+}
 
 /**
  *
  * A mapping between identities and Ice objects.
  *
  **/
+#ifndef __SLICE2PHP__
+//
+// dictionary key type not supported in PHP
+//
 local dictionary<Identity, Object> ObjectDict;
+#endif
 
 /**
  *
@@ -56,5 +65,4 @@ local dictionary<Identity, Object> ObjectDict;
  **/
 sequence<Identity> IdentitySeq;
 
-};
-
+}

data/slice/Ice/ImplicitContext.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,11 +9,15 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
 
 #include <Ice/LocalException.ice>
 #include <Ice/Current.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -22,11 +26,11 @@ module Ice
  *
  * An interface to associate implict contexts with communicators.
  *
- * When you make a remote invocation without an explicit context parameter,
+ * <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.
+ * associated with the communicator.</p>
  *
- * Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
+ * <p>Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
  * used depends on the value of the <tt>Ice.ImplicitContext</tt> property.
  * <dl>
  * <dt><tt>None</tt> (default)</dt>
@@ -35,15 +39,14 @@ module Ice
  * <dd>The implementation maintains a context per thread.</dd>
  * <dt><tt>Shared</tt></dt>
  * <dd>The implementation maintains a single context shared by all threads.</dd>
- * </dl>
- *  
+ * </dl><p>
+ *
  * <tt>ImplicitContext</tt> 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.
- * 
+ *
  **/
-
 local interface ImplicitContext
 {
     /**
@@ -52,17 +55,17 @@ local interface ImplicitContext
      *
      **/
     ["cpp:const"] Context getContext();
-    
+
     /**
      * Set the underlying context.
      *
      * @param newContext The new context.
-     * 
+     *
      **/
     void setContext(Context newContext);
 
     /**
-     * Check if this key has an associated value in the underlying context. 
+     * Check if this key has an associated value in the underlying context.
      *
      * @param key The key.
      *
@@ -70,11 +73,11 @@ local interface ImplicitContext
      *
      **/
     ["cpp:const"] bool containsKey(string key);
- 
+
     /**
      * Get the value associated with the given key in the underlying context.
      * Returns an empty string if no value is associated with the key.
-     * {@link #containsKey} allows you to distinguish between an empty-string value and 
+     * {@link #containsKey} allows you to distinguish between an empty-string value and
      * no value at all.
      *
      * @param key The key.
@@ -94,7 +97,7 @@ local interface ImplicitContext
      * @return The previous value associated with the key, if any.
      *
      **/
-    string put(string key, string value);
+    string put(string key, string \value);
 
     /**
      * Remove the entry for the given key in the underlying context.
@@ -105,6 +108,5 @@ local interface ImplicitContext
      *
      **/
     string remove(string key);
-};
-};
-
+}
+}