zeroc-ice-x86-mingw 3.6b1 → 3.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (149) hide show
  1. checksums.yaml +4 -4
  2. data/BZIP2_LICENSE +42 -0
  3. data/ICE_LICENSE +8 -14
  4. data/LICENSE +2 -1
  5. data/MCPP_LICENSE +29 -0
  6. data/bin/slice2rb +1 -1
  7. data/ice-x86-mingw.gemspec +3 -3
  8. data/lib/Glacier2.rb +1 -1
  9. data/lib/Glacier2/Metrics.rb +2 -2
  10. data/lib/Glacier2/PermissionsVerifier.rb +2 -2
  11. data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
  12. data/lib/Glacier2/Router.rb +2 -2
  13. data/lib/Glacier2/RouterF.rb +2 -2
  14. data/lib/Glacier2/SSLInfo.rb +2 -2
  15. data/lib/Glacier2/Session.rb +2 -2
  16. data/lib/Ice.rb +1 -1
  17. data/lib/Ice/BuiltinSequences.rb +2 -2
  18. data/lib/Ice/Communicator.rb +2 -2
  19. data/lib/Ice/CommunicatorF.rb +2 -2
  20. data/lib/Ice/Connection.rb +26 -14
  21. data/lib/Ice/ConnectionF.rb +2 -2
  22. data/lib/Ice/Current.rb +2 -2
  23. data/lib/Ice/Endpoint.rb +4 -2
  24. data/lib/Ice/EndpointF.rb +2 -2
  25. data/lib/Ice/EndpointTypes.rb +2 -2
  26. data/lib/Ice/FacetMap.rb +2 -2
  27. data/lib/Ice/Identity.rb +2 -2
  28. data/lib/Ice/ImplicitContext.rb +2 -2
  29. data/lib/Ice/ImplicitContextF.rb +2 -2
  30. data/lib/Ice/Instrumentation.rb +2 -2
  31. data/lib/Ice/InstrumentationF.rb +2 -2
  32. data/lib/Ice/LocalException.rb +2 -2
  33. data/lib/Ice/Locator.rb +2 -2
  34. data/lib/Ice/LocatorF.rb +2 -2
  35. data/lib/Ice/Logger.rb +2 -2
  36. data/lib/Ice/LoggerF.rb +2 -2
  37. data/lib/Ice/Metrics.rb +2 -2
  38. data/lib/Ice/ObjectAdapterF.rb +2 -2
  39. data/lib/Ice/ObjectFactory.rb +2 -2
  40. data/lib/Ice/ObjectFactoryF.rb +2 -2
  41. data/lib/Ice/Plugin.rb +2 -2
  42. data/lib/Ice/PluginF.rb +2 -2
  43. data/lib/Ice/Process.rb +2 -2
  44. data/lib/Ice/ProcessF.rb +2 -2
  45. data/lib/Ice/Properties.rb +2 -2
  46. data/lib/Ice/PropertiesAdmin.rb +2 -2
  47. data/lib/Ice/PropertiesF.rb +2 -2
  48. data/lib/Ice/Router.rb +2 -2
  49. data/lib/Ice/RouterF.rb +2 -2
  50. data/lib/Ice/SliceChecksumDict.rb +2 -2
  51. data/lib/Ice/Version.rb +2 -2
  52. data/lib/IceBox.rb +1 -1
  53. data/lib/IceBox/IceBox.rb +2 -2
  54. data/lib/IceGrid.rb +1 -1
  55. data/lib/IceGrid/Admin.rb +2 -2
  56. data/lib/IceGrid/Descriptor.rb +2 -2
  57. data/lib/IceGrid/Exception.rb +2 -2
  58. data/lib/IceGrid/FileParser.rb +2 -2
  59. data/lib/IceGrid/Locator.rb +2 -2
  60. data/lib/IceGrid/Observer.rb +2 -2
  61. data/lib/IceGrid/Query.rb +2 -2
  62. data/lib/IceGrid/Registry.rb +2 -2
  63. data/lib/IceGrid/Session.rb +2 -2
  64. data/lib/IceGrid/UserAccountMapper.rb +2 -2
  65. data/lib/IcePatch2.rb +1 -1
  66. data/lib/IcePatch2/FileInfo.rb +52 -2
  67. data/lib/IcePatch2/FileServer.rb +33 -4
  68. data/lib/IceRuby.so +0 -0
  69. data/lib/IceStorm.rb +1 -1
  70. data/lib/IceStorm/IceStorm.rb +2 -2
  71. data/lib/IceStorm/Metrics.rb +2 -2
  72. data/slice/Freeze/BackgroundSaveEvictor.ice +2 -2
  73. data/slice/Freeze/CatalogData.ice +2 -2
  74. data/slice/Freeze/Connection.ice +2 -2
  75. data/slice/Freeze/ConnectionF.ice +2 -2
  76. data/slice/Freeze/DB.ice +2 -2
  77. data/slice/Freeze/Evictor.ice +2 -2
  78. data/slice/Freeze/EvictorF.ice +2 -2
  79. data/slice/Freeze/EvictorStorage.ice +2 -2
  80. data/slice/Freeze/Exception.ice +2 -2
  81. data/slice/Freeze/Transaction.ice +2 -2
  82. data/slice/Freeze/TransactionalEvictor.ice +2 -2
  83. data/slice/Glacier2/Metrics.ice +7 -6
  84. data/slice/Glacier2/PermissionsVerifier.ice +4 -3
  85. data/slice/Glacier2/PermissionsVerifierF.ice +3 -2
  86. data/slice/Glacier2/Router.ice +4 -3
  87. data/slice/Glacier2/RouterF.ice +3 -2
  88. data/slice/Glacier2/SSLInfo.ice +3 -2
  89. data/slice/Glacier2/Session.ice +12 -11
  90. data/slice/Ice/BuiltinSequences.ice +4 -3
  91. data/slice/Ice/Communicator.ice +22 -25
  92. data/slice/Ice/CommunicatorF.ice +3 -2
  93. data/slice/Ice/Connection.ice +39 -11
  94. data/slice/Ice/ConnectionF.ice +3 -2
  95. data/slice/Ice/Current.ice +4 -3
  96. data/slice/Ice/Endpoint.ice +11 -3
  97. data/slice/Ice/EndpointF.ice +3 -2
  98. data/slice/Ice/EndpointTypes.ice +3 -2
  99. data/slice/Ice/FacetMap.ice +3 -2
  100. data/slice/Ice/Identity.ice +3 -2
  101. data/slice/Ice/ImplicitContext.ice +3 -2
  102. data/slice/Ice/ImplicitContextF.ice +3 -2
  103. data/slice/Ice/Instrumentation.ice +4 -2
  104. data/slice/Ice/InstrumentationF.ice +4 -2
  105. data/slice/Ice/LocalException.ice +29 -10
  106. data/slice/Ice/Locator.ice +5 -3
  107. data/slice/Ice/LocatorF.ice +3 -2
  108. data/slice/Ice/Logger.ice +3 -2
  109. data/slice/Ice/LoggerF.ice +3 -2
  110. data/slice/Ice/Metrics.ice +15 -14
  111. data/slice/Ice/ObjectAdapter.ice +5 -4
  112. data/slice/Ice/ObjectAdapterF.ice +3 -2
  113. data/slice/Ice/ObjectFactory.ice +3 -2
  114. data/slice/Ice/ObjectFactoryF.ice +3 -2
  115. data/slice/Ice/Plugin.ice +3 -2
  116. data/slice/Ice/PluginF.ice +3 -2
  117. data/slice/Ice/Process.ice +3 -2
  118. data/slice/Ice/ProcessF.ice +3 -2
  119. data/slice/Ice/Properties.ice +3 -2
  120. data/slice/Ice/PropertiesAdmin.ice +3 -2
  121. data/slice/Ice/PropertiesF.ice +3 -2
  122. data/slice/Ice/RemoteLogger.ice +3 -2
  123. data/slice/Ice/Router.ice +3 -2
  124. data/slice/Ice/RouterF.ice +3 -2
  125. data/slice/Ice/ServantLocator.ice +3 -2
  126. data/slice/Ice/ServantLocatorF.ice +3 -2
  127. data/slice/Ice/SliceChecksumDict.ice +3 -2
  128. data/slice/Ice/Version.ice +3 -2
  129. data/slice/IceBox/IceBox.ice +2 -2
  130. data/slice/IceDiscovery/IceDiscovery.ice +2 -2
  131. data/slice/IceGrid/Admin.ice +49 -48
  132. data/slice/IceGrid/Descriptor.ice +3 -2
  133. data/slice/IceGrid/Exception.ice +6 -5
  134. data/slice/IceGrid/FileParser.ice +4 -3
  135. data/slice/IceGrid/Locator.ice +4 -3
  136. data/slice/IceGrid/Observer.ice +28 -27
  137. data/slice/IceGrid/PluginFacade.ice +3 -2
  138. data/slice/IceGrid/Query.ice +3 -2
  139. data/slice/IceGrid/Registry.ice +4 -3
  140. data/slice/IceGrid/Session.ice +9 -8
  141. data/slice/IceGrid/UserAccountMapper.ice +4 -3
  142. data/slice/{IceGrid/Discovery.ice → IceLocatorDiscovery/IceLocatorDiscovery.ice} +12 -14
  143. data/slice/IcePatch2/FileInfo.ice +31 -2
  144. data/slice/IcePatch2/FileServer.ice +63 -5
  145. data/slice/IceSSL/ConnectionInfo.ice +17 -2
  146. data/slice/IceSSL/EndpointInfo.ice +21 -3
  147. data/slice/IceStorm/IceStorm.ice +3 -2
  148. data/slice/IceStorm/Metrics.ice +4 -3
  149. metadata +8 -6
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -9,9 +9,10 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
  [["cpp:include:IceGrid/Config.h"]]
14
14
 
15
+ ["objc:prefix:ICEGRID"]
15
16
  module IceGrid
16
17
  {
17
18
 
@@ -48,7 +49,7 @@ interface UserAccountMapper
48
49
  *
49
50
  * @throws UserAccountNotFoundException Raised if no user account
50
51
  * is found for the given user.
51
- *
52
+ *
52
53
  **/
53
54
  string getUserAccount(string user)
54
55
  throws UserAccountNotFoundException;
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -8,20 +8,18 @@
8
8
  // **********************************************************************
9
9
 
10
10
  #pragma once
11
-
12
- [["cpp:header-ext:h"]]
13
- [["cpp:include:IceGrid/Config.h"]]
11
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
14
12
 
15
13
  #include <Ice/Locator.ice>
16
14
 
17
- module IceGrid
15
+ module IceLocatorDiscovery
18
16
  {
19
17
 
20
18
  /**
21
19
  *
22
- * The IceGrid lookup reply interface provides must be implemented by
23
- * clients which are searching for IceGrid locators. IceGrid
24
- * registries invoke on this interface to provide their locator proxy.
20
+ * The Ice lookup reply interface must be implemented by clients which
21
+ * are searching for Ice locators. Ice locator implementations invoke
22
+ * on this interface to provide their locator proxy.
25
23
  *
26
24
  * @see Locator
27
25
  * @see Lookup
@@ -42,12 +40,12 @@ interface LookupReply
42
40
 
43
41
  /**
44
42
  *
45
- * The IceGrid lookup interface is implemented by IceGrid registries
46
- * and can be used by clients to find available IceGrid locators on
47
- * the network.
43
+ * The Ice lookup interface is implemented by Ice locator
44
+ * implementations and can be used by clients to find available Ice
45
+ * locators on the network.
48
46
  *
49
- * IceGrid registries provide a well-known `IceGrid/Lookup' object
50
- * accessible through UDP multicast. Clients typically make a
47
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup'
48
+ * object accessible through UDP multicast. Clients typically make a
51
49
  * multicast findLocator request to find the locator proxy.
52
50
  *
53
51
  * @see Locator
@@ -60,7 +58,7 @@ interface Lookup
60
58
  *
61
59
  * Find a locator proxy with the given instance name.
62
60
  *
63
- * @param instanceName Restrict the search to IceGrid registries
61
+ * @param instanceName Restrict the search to Ice registries
64
62
  * configured with the given instance name. If empty, all the
65
63
  * available registries will reply.
66
64
  *
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -9,11 +9,12 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
  [["cpp:include:IcePatch2/Config.h"]]
14
14
 
15
15
  #include <Ice/BuiltinSequences.ice>
16
16
 
17
+ ["objc:prefix:ICEPATCH2"]
17
18
  module IcePatch2
18
19
  {
19
20
 
@@ -44,6 +45,34 @@ struct FileInfo
44
45
  **/
45
46
  sequence<FileInfo> FileInfoSeq;
46
47
 
48
+
49
+ /**
50
+ *
51
+ * Basic information about a single file.
52
+ *
53
+ **/
54
+ struct LargeFileInfo
55
+ {
56
+ /** The pathname. **/
57
+ string path;
58
+
59
+ /** The SHA-1 checksum of the file. **/
60
+ Ice::ByteSeq checksum;
61
+
62
+ /** The size of the compressed file in number of bytes. **/
63
+ long size;
64
+
65
+ /** The executable flag. */
66
+ bool executable;
67
+ };
68
+
69
+ /**
70
+ *
71
+ * A sequence with information about many files.
72
+ *
73
+ **/
74
+ sequence<LargeFileInfo> LargeFileInfoSeq;
75
+
47
76
  };
48
77
 
49
78
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
  [["cpp:include:IcePatch2/Config.h"]]
14
14
 
15
15
  #include <IcePatch2/FileInfo.ice>
@@ -21,6 +21,7 @@
21
21
  * compressed before download.
22
22
  *
23
23
  **/
24
+ ["objc:prefix:ICEPATCH2"]
24
25
  module IcePatch2
25
26
  {
26
27
 
@@ -58,6 +59,19 @@ exception FileAccessException
58
59
  string reason;
59
60
  };
60
61
 
62
+ /**
63
+ *
64
+ * This exception is raised if {@link FileServer#getFileCompressed} or
65
+ * {@link FileServer#getFileInfoSeq} try to operate in files with size
66
+ * large than 2.1 GB, these operations does not support working with
67
+ * large files instead {@link FileServer#getLargeFileCompressed} and
68
+ * {@link FileServer#getLargeFileInfoSeq} must be used.
69
+ *
70
+ **/
71
+ exception FileSizeRangeException extends FileAccessException
72
+ {
73
+ };
74
+
61
75
  /**
62
76
  *
63
77
  * The interface that provides access to files.
@@ -69,6 +83,10 @@ interface FileServer
69
83
  *
70
84
  * Return the {@link FileInfoSeq} for the specified partition. If the
71
85
  * partion number is out of range, the operation throws
86
+ *
87
+ * <p class="Deprecated"> This operation is deprecated, and only keep for
88
+ * compativility with old Ice clients (older than version 3.6).
89
+ *
72
90
  * {@link PartitionOutOfRangException}.
73
91
  *
74
92
  * @param partition The partition number in the range 0-255.
@@ -77,7 +95,23 @@ interface FileServer
77
95
  * files in the specified partition.
78
96
  *
79
97
  **/
80
- ["nonmutating", "cpp:const"] idempotent FileInfoSeq getFileInfoSeq(int partition)
98
+ ["deprecate:getFileInfoSeq() is deprecated, use getLargeFileInfoSeq() instead.",
99
+ "nonmutating", "cpp:const"] idempotent FileInfoSeq getFileInfoSeq(int partition)
100
+ throws PartitionOutOfRangeException, FileSizeRangeException;
101
+
102
+ /**
103
+ *
104
+ * Return the {@link FileInfoSeq} for the specified partition. If the
105
+ * partion number is out of range, the operation throws
106
+ * {@link PartitionOutOfRangException}.
107
+ *
108
+ * @param partition The partition number in the range 0-255.
109
+ *
110
+ * @return A sequence containing the {@link FileInfo} structures for
111
+ * files in the specified partition.
112
+ *
113
+ **/
114
+ ["nonmutating", "cpp:const"] idempotent LargeFileInfoSeq getLargeFileInfoSeq(int partition)
81
115
  throws PartitionOutOfRangeException;
82
116
 
83
117
  /**
@@ -110,6 +144,9 @@ interface FileServer
110
144
  * return fewer bytes than requested in case there was an
111
145
  * end-of-file condition.
112
146
  *
147
+ * <p class="Deprecated"> This operation is deprecated, and only keep for
148
+ * compativility with old Ice clients (older than version 3.6).
149
+ *
113
150
  * @param path The pathname (relative to the data directory) for
114
151
  * the file to be read.
115
152
  *
@@ -120,10 +157,31 @@ interface FileServer
120
157
  * @return A sequence containing the compressed file contents.
121
158
  *
122
159
  **/
123
- ["amd", "nonmutating", "cpp:const", "cpp:array"]
160
+ ["deprecate:getFileCompressed() is deprecated, use getLargeFileCompressed() instead.",
161
+ "amd", "nonmutating", "cpp:const", "cpp:array"]
124
162
  idempotent Ice::ByteSeq getFileCompressed(string path, int pos, int num)
163
+ throws FileAccessException, FileSizeRangeException;
164
+
165
+ /**
166
+ *
167
+ * Read the specified file. If the read operation fails, the
168
+ * operation throws {@link FileAccessException}. This operation may only
169
+ * return fewer bytes than requested in case there was an
170
+ * end-of-file condition.
171
+ *
172
+ * @param path The pathname (relative to the data directory) for
173
+ * the file to be read.
174
+ *
175
+ * @param pos The file offset at which to begin reading.
176
+ *
177
+ * @param num The number of bytes to be read.
178
+ *
179
+ * @return A sequence containing the compressed file contents.
180
+ *
181
+ **/
182
+ ["amd", "nonmutating", "cpp:const", "cpp:array"]
183
+ idempotent Ice::ByteSeq getLargeFileCompressed(string path, long pos, int num)
125
184
  throws FileAccessException;
126
185
  };
127
186
 
128
187
  };
129
-
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -9,10 +9,11 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
14
  #include <Ice/Connection.ice>
15
15
 
16
+ ["objc:prefix:ICESSL"]
16
17
  module IceSSL
17
18
  {
18
19
 
@@ -28,6 +29,20 @@ local class ConnectionInfo extends Ice::IPConnectionInfo
28
29
 
29
30
  /** The certificate chain. */
30
31
  Ice::StringSeq certs;
32
+
33
+ /** The certificate chain verification status. */
34
+ bool verified;
35
+ };
36
+
37
+ /**
38
+ *
39
+ * Provides access to the connection details of a secure WebSocket connection
40
+ *
41
+ **/
42
+ local class WSSConnectionInfo extends ConnectionInfo
43
+ {
44
+ /** The headers from the HTTP upgrade request. */
45
+ Ice::HeaderDict headers;
31
46
  };
32
47
 
33
48
  };
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
14
  #include <Ice/Endpoint.ice>
15
15
 
@@ -18,6 +18,7 @@
18
18
  * IceSSL provides a secure transport for Ice.
19
19
  *
20
20
  **/
21
+ ["objc:prefix:ICESSL"]
21
22
  module IceSSL
22
23
  {
23
24
 
@@ -26,7 +27,9 @@ module IceSSL
26
27
  * Uniquely identifies SSL endpoints.
27
28
  *
28
29
  **/
29
- const short EndpointType = 2;
30
+ #ifndef __SLICE2OBJC__ // In Objective-C, Ice::SSLEndpointType is already mapped to ICESSLEndpointType
31
+ const short EndpointType = Ice::SSLEndpointType;
32
+ #endif
30
33
 
31
34
  /**
32
35
  *
@@ -37,5 +40,20 @@ local class EndpointInfo extends Ice::IPEndpointInfo
37
40
  {
38
41
  };
39
42
 
43
+ /**
44
+ *
45
+ * Provides access to a secure WebSocket endpoint information.
46
+ *
47
+ **/
48
+ local class WSSEndpointInfo extends EndpointInfo
49
+ {
50
+ /**
51
+ *
52
+ * The URI configured with the endpoint.
53
+ *
54
+ **/
55
+ string resource;
56
+ };
57
+
40
58
  };
41
59
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
  [["cpp:include:IceStorm/Config.h"]]
14
14
 
15
15
  #include <Ice/Identity.ice>
@@ -25,6 +25,7 @@
25
25
  * easy as invoking a method on an interface.
26
26
  *
27
27
  **/
28
+ ["objc:prefix:ICESTORM"]
28
29
  module IceStorm
29
30
  {
30
31
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -9,11 +9,12 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
  [["cpp:include:IceStorm/Config.h"]]
14
14
 
15
15
  #include <Ice/Metrics.ice>
16
16
 
17
+ ["objc:prefix:ICEMX"]
17
18
  module IceMX
18
19
  {
19
20
 
@@ -58,7 +59,7 @@ class SubscriberMetrics extends Metrics
58
59
  * Number of outstanding events.
59
60
  *
60
61
  **/
61
- int outstanding = 0;
62
+ int outstanding = 0;
62
63
 
63
64
  /**
64
65
  *
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zeroc-ice-x86-mingw
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6b1
4
+ version: 3.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - ZeroC, Inc.
@@ -33,8 +33,10 @@ executables:
33
33
  extensions: []
34
34
  extra_rdoc_files: []
35
35
  files:
36
+ - BZIP2_LICENSE
36
37
  - ICE_LICENSE
37
38
  - LICENSE
39
+ - MCPP_LICENSE
38
40
  - bin/slice2rb
39
41
  - ice-x86-mingw.gemspec
40
42
  - lib/Glacier2.rb
@@ -162,7 +164,6 @@ files:
162
164
  - slice/IceDiscovery/IceDiscovery.ice
163
165
  - slice/IceGrid/Admin.ice
164
166
  - slice/IceGrid/Descriptor.ice
165
- - slice/IceGrid/Discovery.ice
166
167
  - slice/IceGrid/Exception.ice
167
168
  - slice/IceGrid/FileParser.ice
168
169
  - slice/IceGrid/Locator.ice
@@ -172,13 +173,14 @@ files:
172
173
  - slice/IceGrid/Registry.ice
173
174
  - slice/IceGrid/Session.ice
174
175
  - slice/IceGrid/UserAccountMapper.ice
176
+ - slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
175
177
  - slice/IcePatch2/FileInfo.ice
176
178
  - slice/IcePatch2/FileServer.ice
177
179
  - slice/IceSSL/ConnectionInfo.ice
178
180
  - slice/IceSSL/EndpointInfo.ice
179
181
  - slice/IceStorm/IceStorm.ice
180
182
  - slice/IceStorm/Metrics.ice
181
- homepage: https://www.zeroc.com
183
+ homepage: https://zeroc.com
182
184
  licenses:
183
185
  - GPL v2 with exceptions
184
186
  metadata: {}
@@ -195,12 +197,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
195
197
  version: '2.1'
196
198
  required_rubygems_version: !ruby/object:Gem::Requirement
197
199
  requirements:
198
- - - ">"
200
+ - - ">="
199
201
  - !ruby/object:Gem::Version
200
- version: 1.3.1
202
+ version: '0'
201
203
  requirements: []
202
204
  rubyforge_project:
203
- rubygems_version: 2.2.2
205
+ rubygems_version: 2.4.5
204
206
  signing_key:
205
207
  specification_version: 4
206
208
  summary: ZeroC Ice for Ruby