zeroc-ice 3.7.9.1 → 3.7.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (217) hide show
  1. checksums.yaml +4 -4
  2. data/ext/ice/cpp/include/Ice/Config.h +5 -7
  3. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -1
  4. data/ext/ice/cpp/include/Ice/Ice.h +2 -2
  5. data/ext/ice/cpp/include/Ice/SHA1.h +0 -2
  6. data/ext/ice/cpp/include/IceSSL/IceSSL.h +3 -7
  7. data/ext/ice/cpp/include/IceUtil/Config.h +12 -44
  8. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -1
  9. data/ext/ice/cpp/include/IceUtil/FileUtil.h +0 -3
  10. data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -1
  11. data/ext/ice/cpp/include/IceUtil/Mutex.h +0 -4
  12. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +5 -21
  13. data/ext/ice/cpp/include/IceUtil/Thread.h +4 -18
  14. data/ext/ice/cpp/include/IceUtil/Timer.h +1 -0
  15. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
  16. data/ext/ice/cpp/include/generated/Ice/Communicator.h +2 -2
  17. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
  18. data/ext/ice/cpp/include/generated/Ice/Connection.h +2 -2
  19. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +2 -2
  20. data/ext/ice/cpp/include/generated/Ice/Current.h +4 -4
  21. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +2 -2
  22. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +2 -2
  23. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
  24. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +2 -2
  25. data/ext/ice/cpp/include/generated/Ice/Identity.h +2 -2
  26. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +2 -2
  27. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +2 -2
  28. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +2 -2
  29. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +2 -2
  30. data/ext/ice/cpp/include/generated/Ice/LocalException.h +2 -2
  31. data/ext/ice/cpp/include/generated/Ice/Locator.h +2 -2
  32. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +2 -2
  33. data/ext/ice/cpp/include/generated/Ice/Logger.h +2 -2
  34. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +2 -2
  35. data/ext/ice/cpp/include/generated/Ice/Metrics.h +2 -2
  36. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +2 -2
  37. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +2 -2
  38. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +2 -2
  39. data/ext/ice/cpp/include/generated/Ice/Plugin.h +2 -2
  40. data/ext/ice/cpp/include/generated/Ice/PluginF.h +2 -2
  41. data/ext/ice/cpp/include/generated/Ice/Process.h +2 -2
  42. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +2 -2
  43. data/ext/ice/cpp/include/generated/Ice/Properties.h +8 -8
  44. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +2 -2
  45. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
  46. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2 -2
  47. data/ext/ice/cpp/include/generated/Ice/Router.h +2 -2
  48. data/ext/ice/cpp/include/generated/Ice/RouterF.h +2 -2
  49. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +2 -2
  50. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +2 -2
  51. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
  52. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +2 -2
  53. data/ext/ice/cpp/include/generated/Ice/Version.h +2 -2
  54. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +2 -2
  55. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
  56. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +2 -2
  57. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
  58. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +2 -2
  59. data/ext/ice/cpp/src/Ice/Communicator.cpp +2 -2
  60. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +2 -2
  61. data/ext/ice/cpp/src/Ice/Connection.cpp +2 -2
  62. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +2 -2
  63. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +1 -1
  64. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +2 -2
  65. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +5 -5
  66. data/ext/ice/cpp/src/Ice/ConnectionI.h +6 -8
  67. data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +0 -8
  68. data/ext/ice/cpp/src/Ice/Current.cpp +2 -2
  69. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +0 -2
  70. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +2 -9
  71. data/ext/ice/cpp/src/Ice/Endpoint.cpp +2 -2
  72. data/ext/ice/cpp/src/Ice/EndpointF.cpp +2 -2
  73. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +2 -2
  74. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
  75. data/ext/ice/cpp/src/Ice/EventHandler.h +2 -2
  76. data/ext/ice/cpp/src/Ice/Exception.cpp +0 -27
  77. data/ext/ice/cpp/src/Ice/FacetMap.cpp +2 -2
  78. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +0 -46
  79. data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -11
  80. data/ext/ice/cpp/src/Ice/Identity.cpp +2 -2
  81. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +2 -2
  82. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +2 -2
  83. data/ext/ice/cpp/src/Ice/Instance.cpp +2 -6
  84. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +2 -2
  85. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
  86. data/ext/ice/cpp/src/Ice/LocalException.cpp +2 -2
  87. data/ext/ice/cpp/src/Ice/Locator.cpp +2 -2
  88. data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
  89. data/ext/ice/cpp/src/Ice/Logger.cpp +2 -2
  90. data/ext/ice/cpp/src/Ice/LoggerF.cpp +2 -2
  91. data/ext/ice/cpp/src/Ice/LoggerI.cpp +1 -3
  92. data/ext/ice/cpp/src/Ice/Metrics.cpp +2 -2
  93. data/ext/ice/cpp/src/Ice/Network.cpp +15 -841
  94. data/ext/ice/cpp/src/Ice/Network.h +4 -86
  95. data/ext/ice/cpp/src/Ice/NetworkF.h +0 -4
  96. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +0 -13
  97. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +2 -2
  98. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +2 -2
  99. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +2 -2
  100. data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
  101. data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
  102. data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
  103. data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
  104. data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
  105. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
  106. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
  107. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +4 -12
  108. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +2 -2
  109. data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
  110. data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
  111. data/ext/ice/cpp/src/Ice/SHA1.cpp +27 -43
  112. data/ext/ice/cpp/src/Ice/Selector.cpp +1 -13
  113. data/ext/ice/cpp/src/Ice/Selector.h +1 -17
  114. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +2 -2
  115. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +2 -2
  116. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +2 -2
  117. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +4 -167
  118. data/ext/ice/cpp/src/Ice/StreamSocket.h +3 -10
  119. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +0 -121
  120. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +2 -10
  121. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -1
  122. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -1
  123. data/ext/ice/cpp/src/Ice/Thread.cpp +1 -243
  124. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +15 -51
  125. data/ext/ice/cpp/src/Ice/ThreadPool.h +6 -6
  126. data/ext/ice/cpp/src/Ice/Transceiver.h +1 -1
  127. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +0 -5
  128. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +13 -360
  129. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +2 -23
  130. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +2 -2
  131. data/ext/ice/cpp/src/Ice/Version.cpp +2 -2
  132. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +2 -2
  133. data/ext/ice/cpp/src/Ice/WSAcceptor.h +2 -2
  134. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +2 -45
  135. data/ext/ice/cpp/src/Ice/WSTransceiver.h +2 -2
  136. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +2 -2
  137. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +2 -2
  138. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
  139. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +2 -2
  140. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -2
  141. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +2 -2
  142. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +2 -2
  143. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +2 -2
  144. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +2 -2
  145. data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
  146. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -1
  147. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +4 -17
  148. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +0 -4
  149. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +0 -45
  150. data/ext/ice/cpp/src/IceUtil/UUID.cpp +2 -6
  151. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +1 -1
  152. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +22 -0
  153. data/ext/ice/cpp/src/Slice/JavaUtil.h +9 -0
  154. data/ext/ice/mcpp/system.c +0 -4
  155. data/ice.gemspec +1 -1
  156. data/lib/Glacier2/Metrics.rb +1 -1
  157. data/lib/Glacier2/PermissionsVerifier.rb +1 -1
  158. data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
  159. data/lib/Glacier2/Router.rb +1 -1
  160. data/lib/Glacier2/RouterF.rb +1 -1
  161. data/lib/Glacier2/SSLInfo.rb +1 -1
  162. data/lib/Glacier2/Session.rb +1 -1
  163. data/lib/Ice/BuiltinSequences.rb +1 -1
  164. data/lib/Ice/Communicator.rb +1 -1
  165. data/lib/Ice/CommunicatorF.rb +1 -1
  166. data/lib/Ice/Connection.rb +1 -1
  167. data/lib/Ice/ConnectionF.rb +1 -1
  168. data/lib/Ice/Current.rb +1 -1
  169. data/lib/Ice/Endpoint.rb +1 -1
  170. data/lib/Ice/EndpointF.rb +1 -1
  171. data/lib/Ice/EndpointTypes.rb +1 -1
  172. data/lib/Ice/FacetMap.rb +1 -1
  173. data/lib/Ice/Identity.rb +1 -1
  174. data/lib/Ice/ImplicitContext.rb +1 -1
  175. data/lib/Ice/ImplicitContextF.rb +1 -1
  176. data/lib/Ice/Instrumentation.rb +1 -1
  177. data/lib/Ice/InstrumentationF.rb +1 -1
  178. data/lib/Ice/LocalException.rb +1 -1
  179. data/lib/Ice/Locator.rb +1 -1
  180. data/lib/Ice/LocatorF.rb +1 -1
  181. data/lib/Ice/Logger.rb +1 -1
  182. data/lib/Ice/LoggerF.rb +1 -1
  183. data/lib/Ice/Metrics.rb +1 -1
  184. data/lib/Ice/ObjectAdapter.rb +1 -1
  185. data/lib/Ice/ObjectAdapterF.rb +1 -1
  186. data/lib/Ice/ObjectFactory.rb +1 -1
  187. data/lib/Ice/Plugin.rb +1 -1
  188. data/lib/Ice/PluginF.rb +1 -1
  189. data/lib/Ice/Process.rb +1 -1
  190. data/lib/Ice/ProcessF.rb +1 -1
  191. data/lib/Ice/Properties.rb +1 -1
  192. data/lib/Ice/PropertiesAdmin.rb +1 -1
  193. data/lib/Ice/PropertiesF.rb +1 -1
  194. data/lib/Ice/RemoteLogger.rb +1 -1
  195. data/lib/Ice/Router.rb +1 -1
  196. data/lib/Ice/RouterF.rb +1 -1
  197. data/lib/Ice/ServantLocator.rb +1 -1
  198. data/lib/Ice/ServantLocatorF.rb +1 -1
  199. data/lib/Ice/SliceChecksumDict.rb +1 -1
  200. data/lib/Ice/ValueFactory.rb +1 -1
  201. data/lib/Ice/Version.rb +1 -1
  202. data/lib/IceBox/IceBox.rb +1 -1
  203. data/lib/IceGrid/Admin.rb +1 -1
  204. data/lib/IceGrid/Descriptor.rb +1 -1
  205. data/lib/IceGrid/Exception.rb +1 -1
  206. data/lib/IceGrid/FileParser.rb +1 -1
  207. data/lib/IceGrid/PluginFacade.rb +1 -1
  208. data/lib/IceGrid/Registry.rb +1 -1
  209. data/lib/IceGrid/Session.rb +1 -1
  210. data/lib/IceGrid/UserAccountMapper.rb +1 -1
  211. data/lib/IcePatch2/FileInfo.rb +1 -1
  212. data/lib/IcePatch2/FileServer.rb +1 -1
  213. data/lib/IceStorm/IceStorm.rb +1 -1
  214. data/lib/IceStorm/Metrics.rb +1 -1
  215. data/slice/Ice/Current.ice +1 -1
  216. data/slice/Ice/Properties.ice +3 -3
  217. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ecb057c0fe5721b0811f231abb4e789e5facfb9dfd3ab24488695748f7f02107
4
- data.tar.gz: f5009862bd2e04a332e89a264398aaacf5e311bd753bedef440626baad1b410d
3
+ metadata.gz: ae42f5fe05caee9637fdcc48fbd7d3a6accc3b396db031e022905e10bf1988f9
4
+ data.tar.gz: cc1c08385cc6a4ab8a80317454a588afe9add8e23479edcf3d846b130270bcaf
5
5
  SHA512:
6
- metadata.gz: 2f0e238dcc3a97118f1c2ab13c094ec065226caa963470cca79026a01e1264b45eff60044741d21d6b81afd1faef90e5627adca3fc0b6bd26045f552b17bfabc
7
- data.tar.gz: 50ba5775c9b70e3bb089a0332e6adea971040dde771470b793e21bb20704888cb283571394cf9c433d1dc36d59bf266fe922947a7209487462294ab6968bc990
6
+ metadata.gz: de82b3ad7ea08a4eb1121ae349e9ead401a76609ce9336d8bb0be35d433560e6c9691d39fd06f3df1f696515f3c0cb724cc575a31773b5858296410fb9a1fef8
7
+ data.tar.gz: ed4a6dcf389a087a42bb397e66ae7d0b59a4d7cd5f1667ecee46ece09275caf8338b487a8299fe4f155ed39015b967b202cfbca67adb58ea8c0210fbea6884e3
data/ext/ice/cpp/include/Ice/Config.h CHANGED
@@ -17,13 +17,11 @@
17
17
  #include <vector>
18
18
  #include <map>
19
19
 
20
- #ifndef ICE_OS_UWP
21
- # if defined(_WIN32)
22
- # include <process.h>
23
- # else
24
- # include <sys/types.h>
25
- # include <cstddef>
26
- # endif
20
+ #if defined(_WIN32)
21
+ # include <process.h>
22
+ #else
23
+ # include <sys/types.h>
24
+ # include <cstddef>
27
25
  #endif
28
26
 
29
27
  #ifdef ICE_SWIFT
data/ext/ice/cpp/include/Ice/ConsoleUtil.h CHANGED
@@ -13,7 +13,7 @@ namespace IceInternal
13
13
  using IceUtilInternal::consoleOut;
14
14
  using IceUtilInternal::consoleErr;
15
15
 
16
- #if defined(_WIN32) && !defined(ICE_OS_UWP)
16
+ #if defined(_WIN32)
17
17
  using IceUtilInternal::endl;
18
18
  using IceUtilInternal::flush;
19
19
  #endif
data/ext/ice/cpp/include/Ice/Ice.h CHANGED
@@ -27,7 +27,7 @@
27
27
  #include <Ice/OutgoingAsync.h>
28
28
  #include <Ice/IncomingAsync.h>
29
29
  #include <Ice/Process.h>
30
- #if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
30
+ #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
31
31
  # include <Ice/Application.h>
32
32
  #endif
33
33
  #include <Ice/Connection.h>
@@ -42,7 +42,7 @@
42
42
  #include <Ice/Instrumentation.h>
43
43
  #include <Ice/Metrics.h>
44
44
  #include <Ice/SliceChecksums.h>
45
- #if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
45
+ #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
46
46
  # include <Ice/Service.h>
47
47
  #endif
48
48
  #include <Ice/RegisterPlugins.h>
data/ext/ice/cpp/include/Ice/SHA1.h CHANGED
@@ -16,7 +16,6 @@ namespace IceInternal
16
16
  ICE_API void
17
17
  sha1(const unsigned char*, std::size_t, std::vector<unsigned char>&);
18
18
 
19
- #ifndef ICE_OS_UWP
20
19
  class ICE_API SHA1
21
20
  {
22
21
  public:
@@ -36,7 +35,6 @@ private:
36
35
  class Hasher;
37
36
  UniquePtr<Hasher> _hasher;
38
37
  };
39
- #endif
40
38
 
41
39
  }
42
40
  #endif
data/ext/ice/cpp/include/IceSSL/IceSSL.h CHANGED
@@ -10,15 +10,11 @@
10
10
  #include <IceSSL/Plugin.h>
11
11
 
12
12
  #if defined(_WIN32)
13
- # if defined(ICE_OS_UWP)
14
- # include <IceSSL/UWP.h>
15
- # else
16
- # include <IceSSL/SChannel.h>
17
- # endif
13
+ # include <IceSSL/SChannel.h>
18
14
  #elif defined(__APPLE__)
19
- # include <IceSSL/SecureTransport.h>
15
+ # include <IceSSL/SecureTransport.h>
20
16
  #else
21
- # include <IceSSL/OpenSSL.h>
17
+ # include <IceSSL/OpenSSL.h>
22
18
  #endif
23
19
 
24
20
  #include <IceSSL/EndpointInfo.h>
data/ext/ice/cpp/include/IceUtil/Config.h CHANGED
@@ -137,23 +137,7 @@
137
137
  #if (defined(_MSC_VER) && (_MSC_VER >= 1800)) || \
138
138
  defined(__clang__) || \
139
139
  (defined(ICE_CPP11_COMPILER) && defined(__GNUC__) && (__GNUC__ >= 5))
140
- #define ICE_HAS_CODECVT_UTF8
141
- #endif
142
-
143
- //
144
- // Visual Studio 2015 or later
145
- //
146
- #if defined(_MSC_VER) && (_MSC_VER >= 1900)
147
-
148
- //
149
- // Check if building for UWP
150
- //
151
- # include <winapifamily.h>
152
- # if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
153
- # define ICE_OS_UWP
154
- # define ICE_STATIC_LIBS
155
- # endif
156
-
140
+ # define ICE_HAS_CODECVT_UTF8
157
141
  #endif
158
142
 
159
143
  //
@@ -284,8 +268,8 @@
284
268
  //
285
269
  // The Ice version.
286
270
  //
287
- #define ICE_STRING_VERSION "3.7.9" // "A.B.C", with A=major, B=minor, C=patch
288
- #define ICE_INT_VERSION 30709 // AABBCC, with AA=major, BB=minor, CC=patch
271
+ #define ICE_STRING_VERSION "3.7.10" // "A.B.C", with A=major, B=minor, C=patch
272
+ #define ICE_INT_VERSION 30710 // AABBCC, with AA=major, BB=minor, CC=patch
289
273
  #define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch
290
274
 
291
275
  #if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
@@ -298,33 +282,17 @@
298
282
  # endif
299
283
 
300
284
  # ifdef ICE_CPP11_MAPPING
301
- # if defined(_DEBUG)
302
- # if defined(ICE_OS_UWP)
303
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11D.lib"
304
- # else
305
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D.lib"
306
- # endif
307
- # else
308
- # if defined(ICE_OS_UWP)
309
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11.lib"
310
- # else
311
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11.lib"
312
- # endif
313
- # endif
285
+ # if defined(_DEBUG)
286
+ # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D.lib"
287
+ # else
288
+ # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11.lib"
289
+ # endif
314
290
  # else
315
- # if defined(_DEBUG)
316
- # if defined(ICE_OS_UWP)
317
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwpD.lib"
318
- # else
319
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D.lib"
320
- # endif
321
- # else
322
- # if defined(ICE_OS_UWP)
323
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp.lib"
324
- # else
291
+ # if defined(_DEBUG)
292
+ # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D.lib"
293
+ # else
325
294
  # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ".lib"
326
- # endif
327
- # endif
295
+ # endif
328
296
  # endif
329
297
 
330
298
  //
data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h CHANGED
@@ -12,7 +12,7 @@
12
12
  namespace IceUtilInternal
13
13
  {
14
14
 
15
- #if defined(_WIN32) && !defined(ICE_OS_UWP)
15
+ #if defined(_WIN32)
16
16
 
17
17
  class ConsoleUtil;
18
18
  ICE_DEFINE_PTR(ConsoleUtilPtr, ConsoleUtil);
data/ext/ice/cpp/include/IceUtil/FileUtil.h CHANGED
@@ -84,10 +84,7 @@ ICE_API int mkdir(const std::string&, int);
84
84
  ICE_API FILE* fopen(const std::string&, const std::string&);
85
85
  ICE_API FILE* freopen(const std::string&, const std::string&, FILE*);
86
86
  ICE_API int open(const std::string&, int);
87
-
88
- #ifndef ICE_OS_UWP
89
87
  ICE_API int getcwd(std::string&);
90
- #endif
91
88
 
92
89
  ICE_API int unlink(const std::string&);
93
90
  ICE_API int close(int);
data/ext/ice/cpp/include/IceUtil/IceUtil.h CHANGED
@@ -15,7 +15,7 @@
15
15
  #include <IceUtil/Config.h>
16
16
  #include <IceUtil/Cond.h>
17
17
  #include <IceUtil/ConsoleUtil.h>
18
- #if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
18
+ #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
19
19
  # include <IceUtil/CtrlCHandler.h>
20
20
  #endif
21
21
  #include <IceUtil/Exception.h>
data/ext/ice/cpp/include/IceUtil/Mutex.h CHANGED
@@ -137,11 +137,7 @@ Mutex::Mutex(MutexProtocol protocol)
137
137
  inline void
138
138
  Mutex::init(MutexProtocol)
139
139
  {
140
- #ifdef ICE_OS_UWP
141
- InitializeCriticalSectionEx(&_mutex, 0, 0);
142
- #else
143
140
  InitializeCriticalSection(&_mutex);
144
- #endif
145
141
  }
146
142
 
147
143
  inline
data/ext/ice/cpp/include/IceUtil/ResourceConfig.h CHANGED
@@ -7,40 +7,24 @@
7
7
 
8
8
  #include "winver.h"
9
9
 
10
- #define ICE_VERSION 3,7,9,0
11
- #define ICE_STRING_VERSION "3.7.9\0"
10
+ #define ICE_VERSION 3,7,10,0
11
+ #define ICE_STRING_VERSION "3.7.10\0"
12
12
  #define ICE_SO_VERSION "37\0"
13
13
  #define ICE_COMPANY_NAME "ZeroC, Inc.\0"
14
14
  #define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
15
15
  #define ICE_PRODUCT_NAME "Ice\0"
16
16
 
17
17
  #ifdef ICE_CPP11_MAPPING
18
- # if defined(_DEBUG)
19
- # if defined(ICE_OS_UWP)
20
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11D"
21
- # else
22
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D"
23
- # endif
24
- # else
25
- # if defined(ICE_OS_UWP)
26
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11"
27
- # else
18
+ # if defined(_DEBUG)
19
+ # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D"
20
+ # else
28
21
  # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11"
29
- # endif
30
22
  # endif
31
23
  #else
32
24
  # if defined(_DEBUG)
33
- # if defined(ICE_OS_UWP)
34
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwpD"
35
- # else
36
25
  # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D"
37
- # endif
38
26
  # else
39
- # if defined(ICE_OS_UWP)
40
- # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp"
41
- # else
42
27
  # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ""
43
- # endif
44
28
  # endif
45
29
  #endif
46
30
 
data/ext/ice/cpp/include/IceUtil/Thread.h CHANGED
@@ -10,11 +10,6 @@
10
10
  #include <IceUtil/Handle.h>
11
11
  #include <IceUtil/Mutex.h>
12
12
 
13
- #ifdef ICE_OS_UWP
14
- # include <memory>
15
- # include <thread>
16
- #endif
17
-
18
13
  namespace IceUtil
19
14
  {
20
15
 
@@ -30,9 +25,7 @@ public:
30
25
  //
31
26
  ThreadControl();
32
27
 
33
- #ifdef ICE_OS_UWP
34
- ThreadControl(const std::shared_ptr<std::thread>&);
35
- #elif defined(_WIN32)
28
+ #if defined(_WIN32)
36
29
  ThreadControl(HANDLE, DWORD);
37
30
  #else
38
31
  explicit ThreadControl(pthread_t);
@@ -75,9 +68,7 @@ public:
75
68
  // id() returns the Thread ID on Windows and the underlying pthread_t
76
69
  // on POSIX platforms.
77
70
  //
78
- #ifdef ICE_OS_UWP
79
- typedef std::thread::id ID;
80
- #elif defined(_WIN32)
71
+ #if defined(_WIN32)
81
72
  typedef DWORD ID;
82
73
  #else
83
74
  typedef pthread_t ID;
@@ -89,10 +80,7 @@ public:
89
80
 
90
81
  private:
91
82
 
92
- #ifdef ICE_OS_UWP
93
- std::shared_ptr<std::thread> _thread;
94
- std::thread::id _id;
95
- #elif defined(_WIN32)
83
+ #if defined(_WIN32)
96
84
  HANDLE _handle;
97
85
  DWORD _id;
98
86
  #else
@@ -147,9 +135,7 @@ protected:
147
135
  bool _started;
148
136
  bool _running;
149
137
 
150
- #ifdef ICE_OS_UWP
151
- std::shared_ptr<std::thread> _thread;
152
- #elif defined(_WIN32)
138
+ #if defined(_WIN32)
153
139
  HANDLE _handle;
154
140
  DWORD _id;
155
141
  #else
data/ext/ice/cpp/include/IceUtil/Timer.h CHANGED
@@ -12,6 +12,7 @@
12
12
 
13
13
  #include <set>
14
14
  #include <map>
15
+ #include <functional>
15
16
 
16
17
  namespace IceUtil
17
18
  {
data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/Communicator.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -56,7 +56,7 @@
56
56
  # if ICE_INT_VERSION % 100 >= 50
57
57
  # error Beta header file detected
58
58
  # endif
59
- # if ICE_INT_VERSION % 100 < 9
59
+ # if ICE_INT_VERSION % 100 < 10
60
60
  # error Ice patch level mismatch!
61
61
  # endif
62
62
  #endif
data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/Connection.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -39,7 +39,7 @@
39
39
  # if ICE_INT_VERSION % 100 >= 50
40
40
  # error Beta header file detected
41
41
  # endif
42
- # if ICE_INT_VERSION % 100 < 9
42
+ # if ICE_INT_VERSION % 100 < 10
43
43
  # error Ice patch level mismatch!
44
44
  # endif
45
45
  #endif
data/ext/ice/cpp/include/generated/Ice/ConnectionF.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/Current.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -39,7 +39,7 @@
39
39
  # if ICE_INT_VERSION % 100 >= 50
40
40
  # error Beta header file detected
41
41
  # endif
42
- # if ICE_INT_VERSION % 100 < 9
42
+ # if ICE_INT_VERSION % 100 < 10
43
43
  # error Ice patch level mismatch!
44
44
  # endif
45
45
  #endif
@@ -92,7 +92,7 @@ enum class OperationMode : unsigned char
92
92
  * <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
93
93
  * <code>idempotent</code> keyword instead. For C++, to retain the mapping
94
94
  * of <code>nonmutating</code> operations to C++ <code>const</code>
95
- * member functions, use the <code>\["cpp:const"]</code> metadata
95
+ * member functions, use the <code>["cpp:const"]</code> metadata
96
96
  * directive.
97
97
  */
98
98
  Nonmutating,
@@ -231,7 +231,7 @@ enum OperationMode
231
231
  * <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
232
232
  * <code>idempotent</code> keyword instead. For C++, to retain the mapping
233
233
  * of <code>nonmutating</code> operations to C++ <code>const</code>
234
- * member functions, use the <code>\["cpp:const"]</code> metadata
234
+ * member functions, use the <code>["cpp:const"]</code> metadata
235
235
  * directive.
236
236
  */
237
237
  Nonmutating,
data/ext/ice/cpp/include/generated/Ice/Endpoint.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 >= 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 9
41
+ # if ICE_INT_VERSION % 100 < 10
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/generated/Ice/EndpointF.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/FacetMap.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/Identity.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 >= 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 9
41
+ # if ICE_INT_VERSION % 100 < 10
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/Instrumentation.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 >= 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 9
41
+ # if ICE_INT_VERSION % 100 < 10
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 9
38
+ # if ICE_INT_VERSION % 100 < 10
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/include/generated/Ice/LocalException.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -39,7 +39,7 @@
39
39
  # if ICE_INT_VERSION % 100 >= 50
40
40
  # error Beta header file detected
41
41
  # endif
42
- # if ICE_INT_VERSION % 100 < 9
42
+ # if ICE_INT_VERSION % 100 < 10
43
43
  # error Ice patch level mismatch!
44
44
  # endif
45
45
  #endif
data/ext/ice/cpp/include/generated/Ice/Locator.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.9
5
+ // Ice version 3.7.10
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -45,7 +45,7 @@
45
45
  # if ICE_INT_VERSION % 100 >= 50
46
46
  # error Beta header file detected
47
47
  # endif
48
- # if ICE_INT_VERSION % 100 < 9
48
+ # if ICE_INT_VERSION % 100 < 10
49
49
  # error Ice patch level mismatch!
50
50
  # endif
51
51
  #endif