zeroc-ice-x64-mingw 3.6b1 → 3.6.0

data/slice/Ice/FacetMap.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/Identity.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/ImplicitContext.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,12 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 #include <Ice/LocalException.ice>
 #include <Ice/Current.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/ImplicitContextF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/Instrumentation.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,12 +9,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 #include <Ice/EndpointF.ice>
 #include <Ice/ConnectionF.ice>
 #include <Ice/Current.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -24,6 +25,7 @@ module Ice
  * Ice core internal components (threads, connections, etc).
  *
  **/
+["objc:prefix:ICEINSTRUMENTATION"]
 module Instrumentation
 {
 

data/slice/Ice/InstrumentationF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 
+["objc:prefix:ICEINSTRUMENTATION"]
 module Instrumentation
 {
 

data/slice/Ice/LocalException.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,12 +9,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
 #include <Ice/BuiltinSequences.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -99,7 +100,7 @@ local exception AlreadyRegisteredException
  * registered with the Ice run time or Ice locator.
  *
  * This exception is raised if an attempt is made to remove a servant,
- * servant locator, facet, object factory, plug-in, object adapter, 
+ * servant locator, facet, object factory, plug-in, object adapter,
  * object, or user exception factory that is not currently registered.
  *
  * It's also raised if the Ice locator can't find an object or object
@@ -113,7 +114,7 @@ local exception NotRegisteredException
     /**
      *
      * The kind of object that could not be removed: "servant",
-     * "servant locator", "object factory", "plug-in", 
+     * "servant locator", "object factory", "plug-in",
      * "object adapter", "object", or "user exception factory".
      *
      **/
@@ -178,13 +179,13 @@ local exception UnknownException
 {
     /**
      *
-     * This field is set to the textual representation of the unknown 
+     * This field is set to the textual representation of the unknown
      * exception if available.
      *
      **/
     string unknown;
 };
-    
+
 /**
  *
  * This exception is raised if an operation call on a server raises a
@@ -257,7 +258,7 @@ local exception CommunicatorDestroyedException
 local exception ObjectAdapterDeactivatedException
 {
     /**
-     * 
+     *
      * Name of the adapter.
      *
      **/
@@ -292,7 +293,7 @@ local exception ObjectAdapterIdInUseException
 local exception NoEndpointException
 {
     /**
-     * 
+     *
      * The stringified proxy for which no suitable endpoint is
      * available.
      *
@@ -507,6 +508,24 @@ local exception SocketException extends SyscallException
 {
 };
 
+/**
+ *
+ * This exception indicates CFNetwork errors.
+ *
+ **/
+#ifdef ICE_USE_CFSTREAM
+["cpp:ice_print"]
+local exception CFNetworkException extends SocketException
+{
+    /**
+     *
+     * The domain of the error.
+     *
+     **/
+    string domain;
+};
+#endif
+
 /**
  *
  * This exception indicates file errors.
@@ -989,7 +1008,7 @@ local exception SecurityException
 };
 
 /**
- * 
+ *
  * This exception indicates that an attempt has been made to
  * change the connection properties of a fixed proxy.
  *
@@ -1000,7 +1019,7 @@ local exception FixedProxyException
 };
 
 /**
- * 
+ *
  * Indicates that the response to a request has already been sent;
  * re-dispatching such a request is not possible.
  *

data/slice/Ice/Locator.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+
 
 #include <Ice/Identity.ice>
 #include <Ice/ProcessF.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -103,7 +105,7 @@ interface Locator
      * @param id The adapter id.
      *
      * @return The adapter proxy, or null if the adapter is not active.
-     * 
+     *
      * @throws AdapterNotFoundException Raised if the adapter cannot be
      * found.
      *

data/slice/Ice/LocatorF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/Logger.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/LoggerF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/Metrics.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/BuiltinSequences.ice>
 
@@ -18,8 +18,9 @@
  * The Ice Management eXtension facility. It provides the {@link
  * IceMX#MetricsAdmin} interface for management clients to retrieve
  * metrics from Ice applications.
- * 
+ *
  **/
+["objc:prefix:ICEMX"]
 module IceMX
 {
 
@@ -35,7 +36,7 @@ dictionary<string, int> StringIntDict;
  * The base class for metrics. A metrics object represents a
  * collection of measurements associated to a given a system.
  *
- **/ 
+ **/
 class Metrics
 {
     /**
@@ -44,14 +45,14 @@ class Metrics
      *
      **/
     string id;
-    
+
     /**
      *
      * The total number of objects that were observed by this metrics.
      *
      **/
     long total = 0;
-    
+
     /**
      *
      * The current number of objects observed by this metrics.
@@ -127,7 +128,7 @@ dictionary<string, MetricsMap> MetricsView;
 /**
  *
  * Raised if a metrics view cannot be found.
- * 
+ *
  **/
 exception UnknownMetricsView
 {
@@ -140,7 +141,7 @@ exception UnknownMetricsView
  * that enabled the Ice administrative facility and configured some
  * metrics views.
  *
- **/ 
+ **/
 ["format:sliced"]
 interface MetricsAdmin
 {
@@ -160,7 +161,7 @@ interface MetricsAdmin
      * Enables a metrics view.
      *
      * @param name The metrics view name.
-     * 
+     *
      * @throws UnknownMetricsView Raised if the metrics view cannot be
      * found.
      *
@@ -173,7 +174,7 @@ interface MetricsAdmin
      * Disable a metrics view.
      *
      * @param name The metrics view name.
-     * 
+     *
      * @throws UnknownMetricsView Raised if the metrics view cannot be
      * found.
      *
@@ -263,7 +264,7 @@ class ThreadMetrics extends Metrics
      *
      **/
     int inUseForUser = 0;
-    
+
     /**
      *
      * The number of threads which are currently performing other
@@ -278,7 +279,7 @@ class ThreadMetrics extends Metrics
 /**
  *
  * Provides information on servant dispatch.
- * 
+ *
  **/
 class DispatchMetrics extends Metrics
 {
@@ -329,7 +330,7 @@ class ChildInvocationMetrics extends Metrics
      *
      * The size of the invocation reply. This corresponds to the size
      * of the marshalled output and return parameters.
-     * 
+     *
      **/
     long replySize = 0;
 };
@@ -406,7 +407,7 @@ class ConnectionMetrics extends Metrics
 {
     /**
      *
-     * The number of bytes received by the connection. 
+     * The number of bytes received by the connection.
      *
      **/
     long receivedBytes = 0;