zeroc-ice 3.7.1 → 3.7.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (677) hide show
  1. checksums.yaml +4 -4
  2. data/ICE_LICENSE +1 -1
  3. data/bin/slice2rb +1 -6
  4. data/ext/Communicator.cpp +4 -9
  5. data/ext/Communicator.h +1 -6
  6. data/ext/Config.h +18 -6
  7. data/ext/Connection.cpp +1 -10
  8. data/ext/Connection.h +1 -6
  9. data/ext/Endpoint.cpp +1 -10
  10. data/ext/Endpoint.h +1 -6
  11. data/ext/ImplicitContext.cpp +1 -6
  12. data/ext/ImplicitContext.h +1 -6
  13. data/ext/Init.cpp +1 -6
  14. data/ext/Logger.cpp +1 -6
  15. data/ext/Logger.h +1 -6
  16. data/ext/Operation.cpp +1 -6
  17. data/ext/Operation.h +1 -6
  18. data/ext/Properties.cpp +2 -7
  19. data/ext/Properties.h +1 -6
  20. data/ext/Proxy.cpp +5 -12
  21. data/ext/Proxy.h +1 -6
  22. data/ext/Slice.cpp +3 -18
  23. data/ext/Slice.h +1 -6
  24. data/ext/Types.cpp +11 -16
  25. data/ext/Types.h +1 -6
  26. data/ext/Util.cpp +45 -28
  27. data/ext/Util.h +62 -25
  28. data/ext/ValueFactoryManager.cpp +1 -6
  29. data/ext/ValueFactoryManager.h +1 -6
  30. data/ext/extconf.rb +5 -3
  31. data/ext/ice/cpp/include/Ice/Application.h +1 -6
  32. data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
  33. data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
  34. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
  35. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
  36. data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
  37. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -6
  38. data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
  39. data/ext/ice/cpp/include/Ice/Config.h +1 -6
  40. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
  41. data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -6
  42. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
  43. data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
  44. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -6
  45. data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
  46. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
  47. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
  48. data/ext/ice/cpp/include/Ice/Exception.h +1 -6
  49. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
  50. data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
  51. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -6
  52. data/ext/ice/cpp/include/Ice/Format.h +1 -6
  53. data/ext/ice/cpp/include/Ice/Functional.h +2 -7
  54. data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
  55. data/ext/ice/cpp/include/Ice/Handle.h +1 -6
  56. data/ext/ice/cpp/include/Ice/Ice.h +1 -6
  57. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +6 -13
  58. data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
  59. data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
  60. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
  61. data/ext/ice/cpp/include/Ice/Initialize.h +12 -6
  62. data/ext/ice/cpp/include/Ice/InputStream.h +2 -7
  63. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
  64. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
  65. data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
  66. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
  67. data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
  68. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
  69. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
  70. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
  71. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
  72. data/ext/ice/cpp/include/Ice/Object.h +1 -6
  73. data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
  74. data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
  75. data/ext/ice/cpp/include/Ice/Optional.h +9 -6
  76. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +2 -7
  77. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
  78. data/ext/ice/cpp/include/Ice/OutputStream.h +1 -6
  79. data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
  80. data/ext/ice/cpp/include/Ice/Proxy.h +2 -9
  81. data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
  82. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
  83. data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
  84. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
  85. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
  86. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
  87. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
  88. data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
  89. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
  90. data/ext/ice/cpp/include/Ice/Service.h +1 -6
  91. data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
  92. data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
  93. data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
  94. data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -6
  95. data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
  96. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
  97. data/ext/ice/cpp/include/Ice/UUID.h +1 -6
  98. data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
  99. data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
  100. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
  101. data/ext/ice/cpp/include/Ice/Value.h +1 -6
  102. data/ext/ice/cpp/include/Ice/ValueF.h +1 -6
  103. data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
  104. data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
  105. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +1 -6
  106. data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -6
  107. data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
  108. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
  109. data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
  110. data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -6
  111. data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
  112. data/ext/ice/cpp/include/IceUtil/Config.h +19 -16
  113. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -6
  114. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
  115. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +26 -38
  116. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
  117. data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
  118. data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
  119. data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
  120. data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
  121. data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
  122. data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
  123. data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
  124. data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
  125. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
  126. data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -9
  127. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
  128. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -6
  129. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
  130. data/ext/ice/cpp/include/IceUtil/Optional.h +1 -6
  131. data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
  132. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -6
  133. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
  134. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
  135. data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
  136. data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
  137. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
  138. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +2 -7
  139. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
  140. data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
  141. data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
  142. data/ext/ice/cpp/include/IceUtil/StringConverter.h +1 -6
  143. data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
  144. data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
  145. data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
  146. data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
  147. data/ext/ice/cpp/include/IceUtil/Timer.h +1 -6
  148. data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
  149. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
  150. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +11 -16
  151. data/ext/ice/cpp/include/generated/Ice/Communicator.h +26 -31
  152. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +3 -8
  153. data/ext/ice/cpp/include/generated/Ice/Connection.h +5 -10
  154. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +3 -8
  155. data/ext/ice/cpp/include/generated/Ice/Current.h +33 -38
  156. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +3 -8
  157. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +4 -9
  158. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +7 -12
  159. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +4 -9
  160. data/ext/ice/cpp/include/generated/Ice/Identity.h +5 -10
  161. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +21 -26
  162. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +3 -8
  163. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +3 -8
  164. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +3 -8
  165. data/ext/ice/cpp/include/generated/Ice/LocalException.h +51 -56
  166. data/ext/ice/cpp/include/generated/Ice/Locator.h +61 -21
  167. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +7 -12
  168. data/ext/ice/cpp/include/generated/Ice/Logger.h +3 -8
  169. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +3 -8
  170. data/ext/ice/cpp/include/generated/Ice/Metrics.h +33 -40
  171. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +13 -18
  172. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +3 -8
  173. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +9 -14
  174. data/ext/ice/cpp/include/generated/Ice/Plugin.h +5 -10
  175. data/ext/ice/cpp/include/generated/Ice/PluginF.h +3 -8
  176. data/ext/ice/cpp/include/generated/Ice/Process.h +7 -12
  177. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +5 -10
  178. data/ext/ice/cpp/include/generated/Ice/Properties.h +15 -20
  179. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -13
  180. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +5 -10
  181. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +13 -18
  182. data/ext/ice/cpp/include/generated/Ice/Router.h +14 -19
  183. data/ext/ice/cpp/include/generated/Ice/RouterF.h +5 -10
  184. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +31 -36
  185. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +3 -8
  186. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +3 -8
  187. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +9 -14
  188. data/ext/ice/cpp/include/generated/Ice/Version.h +3 -8
  189. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +3 -8
  190. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +3 -8
  191. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -8
  192. data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
  193. data/ext/ice/cpp/src/Ice/ACM.h +1 -6
  194. data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
  195. data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
  196. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
  197. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
  198. data/ext/ice/cpp/src/Ice/ArgVector.cpp +6 -11
  199. data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
  200. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
  201. data/ext/ice/cpp/src/Ice/Base64.cpp +1 -6
  202. data/ext/ice/cpp/src/Ice/Base64.h +1 -6
  203. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -6
  204. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
  205. data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -6
  206. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -8
  207. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
  208. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
  209. data/ext/ice/cpp/src/Ice/Communicator.cpp +3 -8
  210. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -8
  211. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +4 -10
  212. data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -7
  213. data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
  214. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
  216. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
  217. data/ext/ice/cpp/src/Ice/Connection.cpp +3 -8
  218. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -8
  219. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
  220. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
  221. data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
  222. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +3 -8
  223. data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
  224. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
  225. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
  226. data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
  227. data/ext/ice/cpp/src/Ice/Connector.h +1 -6
  228. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
  229. data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
  230. data/ext/ice/cpp/src/Ice/Current.cpp +3 -8
  231. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -6
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
  233. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
  234. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -6
  235. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -6
  236. data/ext/ice/cpp/src/Ice/Endpoint.cpp +3 -8
  237. data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -8
  238. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
  239. data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
  240. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -6
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
  243. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
  244. data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -6
  245. data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
  246. data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
  247. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -8
  248. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
  249. data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
  250. data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
  251. data/ext/ice/cpp/src/Ice/Exception.cpp +3 -8
  252. data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -8
  253. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
  254. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
  255. data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
  256. data/ext/ice/cpp/src/Ice/HashUtil.h +1 -6
  257. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
  258. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
  259. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +2 -30
  260. data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
  261. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
  262. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
  263. data/ext/ice/cpp/src/Ice/Identity.cpp +3 -8
  264. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +3 -8
  265. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -8
  266. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -7
  267. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
  268. data/ext/ice/cpp/src/Ice/Incoming.cpp +9 -13
  269. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
  270. data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
  271. data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -7
  272. data/ext/ice/cpp/src/Ice/InputStream.cpp +7 -54
  273. data/ext/ice/cpp/src/Ice/Instance.cpp +30 -8
  274. data/ext/ice/cpp/src/Ice/Instance.h +1 -6
  275. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +3 -8
  276. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -8
  277. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
  278. data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
  279. data/ext/ice/cpp/src/Ice/LocalException.cpp +3 -8
  280. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
  281. data/ext/ice/cpp/src/Ice/Locator.cpp +17 -22
  282. data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -8
  283. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
  284. data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
  285. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
  286. data/ext/ice/cpp/src/Ice/Logger.cpp +3 -8
  287. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +7 -12
  288. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
  289. data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -8
  290. data/ext/ice/cpp/src/Ice/LoggerI.cpp +7 -12
  291. data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
  292. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
  293. data/ext/ice/cpp/src/Ice/Metrics.cpp +3 -8
  294. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
  295. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
  296. data/ext/ice/cpp/src/Ice/Network.cpp +46 -29
  297. data/ext/ice/cpp/src/Ice/Network.h +3 -8
  298. data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
  299. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
  300. data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
  301. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
  302. data/ext/ice/cpp/src/Ice/Object.cpp +1 -7
  303. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +3 -8
  304. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -8
  305. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
  306. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
  307. data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
  308. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +9 -6
  309. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -6
  310. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -8
  311. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
  312. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
  313. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
  314. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +5 -8
  315. data/ext/ice/cpp/src/Ice/OutputStream.cpp +5 -37
  316. data/ext/ice/cpp/src/Ice/Plugin.cpp +3 -8
  317. data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -8
  318. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
  319. data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
  320. data/ext/ice/cpp/src/Ice/Process.cpp +7 -12
  321. data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -8
  322. data/ext/ice/cpp/src/Ice/Properties.cpp +3 -8
  323. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +9 -14
  324. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
  325. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
  326. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -8
  327. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +13 -17
  328. data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
  329. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +41 -8
  330. data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
  331. data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
  332. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
  333. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
  334. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
  335. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
  336. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
  337. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
  338. data/ext/ice/cpp/src/Ice/Proxy.cpp +3 -8
  339. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -6
  340. data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
  341. data/ext/ice/cpp/src/Ice/Reference.cpp +61 -33
  342. data/ext/ice/cpp/src/Ice/Reference.h +1 -6
  343. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -8
  344. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
  345. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
  346. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -6
  347. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
  348. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +13 -18
  349. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
  350. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
  351. data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
  352. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
  353. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
  354. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
  355. data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
  356. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +2 -7
  357. data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
  358. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
  359. data/ext/ice/cpp/src/Ice/Router.cpp +11 -16
  360. data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -8
  361. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
  362. data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
  363. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
  364. data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -6
  365. data/ext/ice/cpp/src/Ice/Selector.cpp +46 -17
  366. data/ext/ice/cpp/src/Ice/Selector.h +1 -6
  367. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +3 -8
  368. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -8
  369. data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
  370. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
  371. data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
  372. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -8
  373. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
  374. data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
  375. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +9 -12
  376. data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
  377. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -6
  378. data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
  379. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
  380. data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
  381. data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
  382. data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
  383. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +3 -7
  384. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
  385. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -6
  386. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
  387. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +1 -6
  388. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
  389. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -6
  390. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
  391. data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
  392. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +6 -9
  393. data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -6
  394. data/ext/ice/cpp/src/Ice/Timer.cpp +1 -6
  395. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
  396. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
  397. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
  398. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
  399. data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
  400. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
  401. data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
  402. data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
  403. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
  404. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
  405. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +1 -6
  406. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
  407. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +23 -24
  408. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
  409. data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
  410. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +3 -8
  411. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
  412. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
  413. data/ext/ice/cpp/src/Ice/Version.cpp +3 -8
  414. data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
  415. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
  416. data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
  417. data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
  418. data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
  419. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -6
  420. data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
  421. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +2 -7
  422. data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
  423. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -8
  424. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +11 -16
  425. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
  426. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
  427. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
  428. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
  429. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
  430. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
  431. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -8
  432. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +9 -14
  433. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
  434. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +3 -8
  435. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
  436. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
  437. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -6
  438. data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
  439. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -8
  440. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -8
  441. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
  442. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
  443. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
  444. data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
  445. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -8
  446. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
  447. data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
  448. data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
  449. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -6
  450. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +96 -30
  451. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -7
  452. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
  453. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
  454. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +127 -143
  455. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +2 -11
  456. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
  457. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
  458. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -6
  459. data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -6
  460. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
  461. data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
  462. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
  463. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -29
  464. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -6
  465. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
  466. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
  467. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +35 -30
  468. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
  469. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +2 -7
  470. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -6
  471. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
  472. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +7 -12
  473. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
  474. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
  475. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
  476. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
  477. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +28 -23
  478. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
  479. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +16 -9
  480. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
  481. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
  482. data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
  483. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
  484. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
  485. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
  486. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
  487. data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
  488. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
  489. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
  490. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
  491. data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -6
  492. data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
  493. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
  494. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
  495. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
  496. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
  497. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +1 -6
  498. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
  499. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
  500. data/ext/ice/cpp/src/IceUtil/Options.cpp +22 -12
  501. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -6
  502. data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -6
  503. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -7
  504. data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
  505. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -6
  506. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +42 -9
  507. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
  508. data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -6
  509. data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -6
  510. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
  511. data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
  512. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +13 -12
  513. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +58 -64
  514. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +2 -7
  515. data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
  516. data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
  517. data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
  518. data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
  519. data/ext/ice/cpp/src/Slice/Grammar.cpp +241 -245
  520. data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
  521. data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
  522. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +76 -86
  523. data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
  524. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
  525. data/ext/ice/cpp/src/Slice/MD5.h +1 -6
  526. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +6 -6
  527. data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
  528. data/ext/ice/cpp/src/Slice/Parser.cpp +86 -47
  529. data/ext/ice/cpp/src/Slice/Parser.h +6 -9
  530. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +11 -16
  531. data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -6
  532. data/ext/ice/cpp/src/Slice/Python.cpp +21 -27
  533. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +62 -35
  534. data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
  535. data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
  536. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +12 -14
  537. data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
  538. data/ext/ice/cpp/src/Slice/Scanner.cpp +101 -109
  539. data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
  540. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +1 -6
  541. data/ext/ice/cpp/src/Slice/Util.h +1 -6
  542. data/ice.gemspec +2 -4
  543. data/lib/Glacier2.rb +1 -6
  544. data/lib/Glacier2/Metrics.rb +3 -8
  545. data/lib/Glacier2/PermissionsVerifier.rb +3 -8
  546. data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
  547. data/lib/Glacier2/Router.rb +3 -8
  548. data/lib/Glacier2/RouterF.rb +3 -8
  549. data/lib/Glacier2/SSLInfo.rb +3 -8
  550. data/lib/Glacier2/Session.rb +3 -8
  551. data/lib/Ice.rb +1 -6
  552. data/lib/Ice/BuiltinSequences.rb +3 -8
  553. data/lib/Ice/Communicator.rb +3 -8
  554. data/lib/Ice/CommunicatorF.rb +3 -8
  555. data/lib/Ice/Connection.rb +3 -8
  556. data/lib/Ice/ConnectionF.rb +3 -8
  557. data/lib/Ice/Current.rb +3 -8
  558. data/lib/Ice/Endpoint.rb +3 -8
  559. data/lib/Ice/EndpointF.rb +3 -8
  560. data/lib/Ice/EndpointTypes.rb +3 -8
  561. data/lib/Ice/FacetMap.rb +3 -8
  562. data/lib/Ice/Identity.rb +3 -8
  563. data/lib/Ice/ImplicitContext.rb +3 -8
  564. data/lib/Ice/ImplicitContextF.rb +3 -8
  565. data/lib/Ice/Instrumentation.rb +3 -8
  566. data/lib/Ice/InstrumentationF.rb +3 -8
  567. data/lib/Ice/LocalException.rb +3 -8
  568. data/lib/Ice/Locator.rb +3 -8
  569. data/lib/Ice/LocatorF.rb +3 -8
  570. data/lib/Ice/Logger.rb +3 -8
  571. data/lib/Ice/LoggerF.rb +3 -8
  572. data/lib/Ice/Metrics.rb +3 -8
  573. data/lib/Ice/ObjectAdapter.rb +3 -8
  574. data/lib/Ice/ObjectAdapterF.rb +3 -8
  575. data/lib/Ice/ObjectFactory.rb +3 -8
  576. data/lib/Ice/Plugin.rb +3 -8
  577. data/lib/Ice/PluginF.rb +3 -8
  578. data/lib/Ice/Process.rb +3 -8
  579. data/lib/Ice/ProcessF.rb +3 -8
  580. data/lib/Ice/Properties.rb +3 -8
  581. data/lib/Ice/PropertiesAdmin.rb +3 -8
  582. data/lib/Ice/PropertiesF.rb +3 -8
  583. data/lib/Ice/RemoteLogger.rb +3 -8
  584. data/lib/Ice/Router.rb +3 -8
  585. data/lib/Ice/RouterF.rb +3 -8
  586. data/lib/Ice/ServantLocator.rb +3 -8
  587. data/lib/Ice/ServantLocatorF.rb +3 -8
  588. data/lib/Ice/SliceChecksumDict.rb +3 -8
  589. data/lib/Ice/ValueFactory.rb +3 -8
  590. data/lib/Ice/Version.rb +3 -8
  591. data/lib/IceBox.rb +1 -6
  592. data/lib/IceBox/IceBox.rb +3 -8
  593. data/lib/IceGrid.rb +1 -6
  594. data/lib/IceGrid/Admin.rb +3 -8
  595. data/lib/IceGrid/Descriptor.rb +3 -8
  596. data/lib/IceGrid/Exception.rb +3 -8
  597. data/lib/IceGrid/FileParser.rb +3 -8
  598. data/lib/IceGrid/PluginFacade.rb +3 -8
  599. data/lib/IceGrid/Registry.rb +3 -8
  600. data/lib/IceGrid/Session.rb +3 -8
  601. data/lib/IceGrid/UserAccountMapper.rb +3 -8
  602. data/lib/IcePatch2.rb +1 -6
  603. data/lib/IcePatch2/FileInfo.rb +3 -8
  604. data/lib/IcePatch2/FileServer.rb +3 -8
  605. data/lib/IceStorm.rb +1 -6
  606. data/lib/IceStorm/IceStorm.rb +3 -8
  607. data/lib/IceStorm/Metrics.rb +3 -8
  608. data/slice/Glacier2/Metrics.ice +13 -7
  609. data/slice/Glacier2/PermissionsVerifier.ice +11 -7
  610. data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
  611. data/slice/Glacier2/Router.ice +12 -8
  612. data/slice/Glacier2/RouterF.ice +11 -7
  613. data/slice/Glacier2/SSLInfo.ice +11 -7
  614. data/slice/Glacier2/Session.ice +11 -7
  615. data/slice/Ice/BuiltinSequences.ice +13 -7
  616. data/slice/Ice/Communicator.ice +42 -26
  617. data/slice/Ice/CommunicatorF.ice +13 -7
  618. data/slice/Ice/Connection.ice +21 -15
  619. data/slice/Ice/ConnectionF.ice +13 -7
  620. data/slice/Ice/Current.ice +28 -22
  621. data/slice/Ice/Endpoint.ice +17 -14
  622. data/slice/Ice/EndpointF.ice +13 -7
  623. data/slice/Ice/EndpointTypes.ice +15 -9
  624. data/slice/Ice/FacetMap.ice +13 -7
  625. data/slice/Ice/Identity.ice +13 -7
  626. data/slice/Ice/ImplicitContext.ice +22 -16
  627. data/slice/Ice/ImplicitContextF.ice +12 -7
  628. data/slice/Ice/Instrumentation.ice +13 -7
  629. data/slice/Ice/InstrumentationF.ice +13 -7
  630. data/slice/Ice/LocalException.ice +35 -29
  631. data/slice/Ice/Locator.ice +13 -7
  632. data/slice/Ice/LocatorF.ice +13 -7
  633. data/slice/Ice/Logger.ice +13 -7
  634. data/slice/Ice/LoggerF.ice +13 -7
  635. data/slice/Ice/Metrics.ice +14 -9
  636. data/slice/Ice/ObjectAdapter.ice +24 -18
  637. data/slice/Ice/ObjectAdapterF.ice +13 -7
  638. data/slice/Ice/ObjectFactory.ice +20 -12
  639. data/slice/Ice/Plugin.ice +17 -8
  640. data/slice/Ice/PluginF.ice +17 -7
  641. data/slice/Ice/Process.ice +13 -7
  642. data/slice/Ice/ProcessF.ice +13 -7
  643. data/slice/Ice/Properties.ice +25 -14
  644. data/slice/Ice/PropertiesAdmin.ice +13 -7
  645. data/slice/Ice/PropertiesF.ice +13 -7
  646. data/slice/Ice/RemoteLogger.ice +13 -7
  647. data/slice/Ice/Router.ice +14 -8
  648. data/slice/Ice/RouterF.ice +13 -7
  649. data/slice/Ice/ServantLocator.ice +27 -21
  650. data/slice/Ice/ServantLocatorF.ice +13 -7
  651. data/slice/Ice/SliceChecksumDict.ice +13 -7
  652. data/slice/Ice/ValueFactory.ice +19 -12
  653. data/slice/Ice/Version.ice +13 -7
  654. data/slice/IceBT/ConnectionInfo.ice +12 -7
  655. data/slice/IceBT/EndpointInfo.ice +12 -7
  656. data/slice/IceBT/Types.ice +12 -7
  657. data/slice/IceBox/IceBox.ice +12 -7
  658. data/slice/IceDiscovery/IceDiscovery.ice +12 -7
  659. data/slice/IceGrid/Admin.ice +41 -35
  660. data/slice/IceGrid/Descriptor.ice +15 -10
  661. data/slice/IceGrid/Exception.ice +15 -10
  662. data/slice/IceGrid/FileParser.ice +14 -8
  663. data/slice/IceGrid/PluginFacade.ice +13 -7
  664. data/slice/IceGrid/Registry.ice +13 -7
  665. data/slice/IceGrid/Session.ice +18 -12
  666. data/slice/IceGrid/UserAccountMapper.ice +16 -10
  667. data/slice/IceIAP/ConnectionInfo.ice +10 -7
  668. data/slice/IceIAP/EndpointInfo.ice +10 -7
  669. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
  670. data/slice/IcePatch2/FileInfo.ice +12 -7
  671. data/slice/IcePatch2/FileServer.ice +13 -8
  672. data/slice/IceSSL/ConnectionInfo.ice +13 -7
  673. data/slice/IceSSL/ConnectionInfoF.ice +13 -7
  674. data/slice/IceSSL/EndpointInfo.ice +13 -7
  675. data/slice/IceStorm/IceStorm.ice +17 -11
  676. data/slice/IceStorm/Metrics.ice +12 -8
  677. metadata +4 -2
@@ -1,13 +1,8 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
4
  //
8
- // **********************************************************************
9
- //
10
- // Ice version 3.7.1
5
+ // Ice version 3.7.2
11
6
  //
12
7
  // <auto-generated>
13
8
  //
@@ -43,7 +38,7 @@
43
38
  # if ICE_INT_VERSION % 100 > 50
44
39
  # error Beta header file detected
45
40
  # endif
46
- # if ICE_INT_VERSION % 100 < 1
41
+ # if ICE_INT_VERSION % 100 < 2
47
42
  # error Ice patch level mismatch!
48
43
  # endif
49
44
  #endif
@@ -1,13 +1,8 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
4
  //
8
- // **********************************************************************
9
- //
10
- // Ice version 3.7.1
5
+ // Ice version 3.7.2
11
6
  //
12
7
  // <auto-generated>
13
8
  //
@@ -40,7 +35,7 @@
40
35
  # if ICE_INT_VERSION % 100 > 50
41
36
  # error Beta header file detected
42
37
  # endif
43
- # if ICE_INT_VERSION % 100 < 1
38
+ # if ICE_INT_VERSION % 100 < 2
44
39
  # error Ice patch level mismatch!
45
40
  # endif
46
41
  #endif
@@ -1,13 +1,8 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
4
  //
8
- // **********************************************************************
9
- //
10
- // Ice version 3.7.1
5
+ // Ice version 3.7.2
11
6
  //
12
7
  // <auto-generated>
13
8
  //
@@ -44,7 +39,7 @@
44
39
  # if ICE_INT_VERSION % 100 > 50
45
40
  # error Beta header file detected
46
41
  # endif
47
- # if ICE_INT_VERSION % 100 < 1
42
+ # if ICE_INT_VERSION % 100 < 2
48
43
  # error Ice patch level mismatch!
49
44
  # endif
50
45
  #endif
@@ -263,7 +258,7 @@ public:
263
258
  * The file and line number are required for all local exceptions.
264
259
  * @param file The file name in which the exception was raised, typically __FILE__.
265
260
  * @param line The line number at which the exception was raised, typically __LINE__.
266
- * @param kindOfObject The kind of object that is registered already: "servant", "servant locator", "value factory", "plug-in", "object adapter", "object", or "user exception factory".
261
+ * @param kindOfObject The kind of object that could not be removed: "servant", "facet", "object", "default servant", "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group".
267
262
  * @param id The ID (or name) of the object that is registered already.
268
263
  */
269
264
  AlreadyRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) : LocalExceptionHelper<AlreadyRegisteredException, LocalException>(file, line),
@@ -294,9 +289,9 @@ public:
294
289
  ICE_MEMBER(ICE_API) virtual void ice_print(::std::ostream& stream) const override;
295
290
 
296
291
  /**
297
- * The kind of object that is registered already: "servant",
298
- * "servant locator", "value factory", "plug-in",
299
- * "object adapter", "object", or "user exception factory".
292
+ * The kind of object that could not be removed: "servant", "facet",
293
+ * "object", "default servant", "servant locator", "value factory", "plugin",
294
+ * "object adapter", "object adapter with router", "replica group".
300
295
  */
301
296
  ::std::string kindOfObject;
302
297
  /**
@@ -340,7 +335,7 @@ public:
340
335
  * The file and line number are required for all local exceptions.
341
336
  * @param file The file name in which the exception was raised, typically __FILE__.
342
337
  * @param line The line number at which the exception was raised, typically __LINE__.
343
- * @param kindOfObject The kind of object that could not be removed: "servant", "servant locator", "value factory", "plug-in", "object adapter", "object", or "user exception factory".
338
+ * @param kindOfObject The kind of object that could not be removed: "servant", "facet", "object", "default servant", "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group".
344
339
  * @param id The ID (or name) of the object that could not be removed.
345
340
  */
346
341
  NotRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) : LocalExceptionHelper<NotRegisteredException, LocalException>(file, line),
@@ -371,9 +366,9 @@ public:
371
366
  ICE_MEMBER(ICE_API) virtual void ice_print(::std::ostream& stream) const override;
372
367
 
373
368
  /**
374
- * The kind of object that could not be removed: "servant",
375
- * "servant locator", "value factory", "plug-in",
376
- * "object adapter", "object", or "user exception factory".
369
+ * The kind of object that could not be removed: "servant", "facet",
370
+ * "object", "default servant", "servant locator", "value factory", "plugin",
371
+ * "object adapter", "object adapter with router", "replica group".
377
372
  */
378
373
  ::std::string kindOfObject;
379
374
  /**
@@ -386,8 +381,8 @@ public:
386
381
  * The operation can only be invoked with a twoway request.
387
382
  *
388
383
  * This exception is raised if an attempt is made to invoke an
389
- * operation with <tt>ice_oneway</tt>, <tt>ice_batchOneway</tt>, <tt>ice_datagram</tt>,
390
- * or <tt>ice_batchDatagram</tt> and the operation has a return value,
384
+ * operation with <code>ice_oneway</code>, <code>ice_batchOneway</code>, <code>ice_datagram</code>,
385
+ * or <code>ice_batchDatagram</code> and the operation has a return value,
391
386
  * out-parameters, or an exception specification.
392
387
  * \headerfile Ice/Ice.h
393
388
  */
@@ -451,10 +446,10 @@ public:
451
446
  * An attempt was made to clone a class that does not support
452
447
  * cloning.
453
448
  *
454
- * This exception is raised if <tt>ice_clone</tt> is called on
449
+ * This exception is raised if <code>ice_clone</code> is called on
455
450
  * a class that is derived from an abstract Slice class (that is,
456
451
  * a class containing operations), and the derived class does not
457
- * provide an implementation of the <tt>ice_clone</tt> operation (C++ only).
452
+ * provide an implementation of the <code>ice_clone</code> operation (C++ only).
458
453
  * \headerfile Ice/Ice.h
459
454
  */
460
455
  class ICE_CLASS(ICE_API) CloneNotImplementedException : public LocalExceptionHelper<CloneNotImplementedException, LocalException>
@@ -500,8 +495,8 @@ public:
500
495
  * This exception is raised if an operation call on a server raises an
501
496
  * unknown exception. For example, for C++, this exception is raised
502
497
  * if the server throws a C++ exception that is not directly or
503
- * indirectly derived from <tt>Ice::LocalException</tt> or
504
- * <tt>Ice::UserException</tt>.
498
+ * indirectly derived from <code>Ice::LocalException</code> or
499
+ * <code>Ice::UserException</code>.
505
500
  * \headerfile Ice/Ice.h
506
501
  */
507
502
  class ICE_CLASS(ICE_API) UnknownException : public LocalExceptionHelper<UnknownException, LocalException>
@@ -568,7 +563,7 @@ public:
568
563
  * by the server as {@link UnknownLocalException}. The only exception to this
569
564
  * rule are all exceptions derived from {@link RequestFailedException},
570
565
  * which are transmitted by the Ice protocol even though they are
571
- * declared <tt>local</tt>.
566
+ * declared <code>local</code>.
572
567
  * \headerfile Ice/Ice.h
573
568
  */
574
569
  class ICE_CLASS(ICE_API) UnknownLocalException : public LocalExceptionHelper<UnknownLocalException, UnknownException>
@@ -627,13 +622,13 @@ public:
627
622
  *
628
623
  * This exception is raised if an operation raises a
629
624
  * user exception that is not declared in the exception's
630
- * <tt>throws</tt> clause. Such undeclared exceptions are
625
+ * <code>throws</code> clause. Such undeclared exceptions are
631
626
  * not transmitted from the server to the client by the Ice
632
627
  * protocol, but instead the client just gets an
633
628
  * {@link UnknownUserException}. This is necessary in order to not violate
634
629
  * the contract established by an operation's signature: Only local
635
630
  * exceptions and user exceptions declared in the
636
- * <tt>throws</tt> clause can be raised.
631
+ * <code>throws</code> clause can be raised.
637
632
  * \headerfile Ice/Ice.h
638
633
  */
639
634
  class ICE_CLASS(ICE_API) UnknownUserException : public LocalExceptionHelper<UnknownUserException, UnknownException>
@@ -1392,7 +1387,7 @@ public:
1392
1387
  * This exception is raised if a request failed. This exception, and
1393
1388
  * all exceptions derived from {@link RequestFailedException}, are
1394
1389
  * transmitted by the Ice protocol, even though they are declared
1395
- * <tt>local</tt>.
1390
+ * <code>local</code>.
1396
1391
  * \headerfile Ice/Ice.h
1397
1392
  */
1398
1393
  class ICE_CLASS(ICE_API) RequestFailedException : public LocalExceptionHelper<RequestFailedException, LocalException>
@@ -1697,10 +1692,10 @@ public:
1697
1692
 
1698
1693
  /**
1699
1694
  * The error number describing the system exception. For C++ and
1700
- * Unix, this is equivalent to <tt>errno</tt>. For C++
1695
+ * Unix, this is equivalent to <code>errno</code>. For C++
1701
1696
  * and Windows, this is the value returned by
1702
- * <tt>GetLastError()</tt> or
1703
- * <tt>WSAGetLastError()</tt>.
1697
+ * <code>GetLastError()</code> or
1698
+ * <code>WSAGetLastError()</code>.
1704
1699
  */
1705
1700
  int error = 0;
1706
1701
  };
@@ -2109,9 +2104,9 @@ public:
2109
2104
 
2110
2105
  /**
2111
2106
  * The error number describing the DNS problem. For C++ and Unix,
2112
- * this is equivalent to <tt>h_errno</tt>. For C++ and
2107
+ * this is equivalent to <code>h_errno</code>. For C++ and
2113
2108
  * Windows, this is the value returned by
2114
- * <tt>WSAGetLastError()</tt>.
2109
+ * <code>WSAGetLastError()</code>.
2115
2110
  */
2116
2111
  int error = 0;
2117
2112
  /**
@@ -3509,7 +3504,7 @@ public:
3509
3504
  /**
3510
3505
  * This exception is raised when Ice receives a request or reply
3511
3506
  * message whose size exceeds the limit specified by the
3512
- * <tt>Ice.MessageSizeMax</tt> property.
3507
+ * <code>Ice.MessageSizeMax</code> property.
3513
3508
  * \headerfile Ice/Ice.h
3514
3509
  */
3515
3510
  class ICE_CLASS(ICE_API) MemoryLimitException : public LocalExceptionHelper<MemoryLimitException, MarshalException>
@@ -4065,7 +4060,7 @@ public:
4065
4060
  * The file and line number are required for all local exceptions.
4066
4061
  * @param file The file name in which the exception was raised, typically __FILE__.
4067
4062
  * @param line The line number at which the exception was raised, typically __LINE__.
4068
- * @param kindOfObject The kind of object that is registered already: "servant", "servant locator", "value factory", "plug-in", "object adapter", "object", or "user exception factory".
4063
+ * @param kindOfObject The kind of object that could not be removed: "servant", "facet", "object", "default servant", "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group".
4069
4064
  * @param id The ID (or name) of the object that is registered already.
4070
4065
  */
4071
4066
  AlreadyRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id);
@@ -4092,9 +4087,9 @@ public:
4092
4087
  virtual void ice_throw() const;
4093
4088
 
4094
4089
  /**
4095
- * The kind of object that is registered already: "servant",
4096
- * "servant locator", "value factory", "plug-in",
4097
- * "object adapter", "object", or "user exception factory".
4090
+ * The kind of object that could not be removed: "servant", "facet",
4091
+ * "object", "default servant", "servant locator", "value factory", "plugin",
4092
+ * "object adapter", "object adapter with router", "replica group".
4098
4093
  */
4099
4094
  ::std::string kindOfObject;
4100
4095
  /**
@@ -4131,7 +4126,7 @@ public:
4131
4126
  * The file and line number are required for all local exceptions.
4132
4127
  * @param file The file name in which the exception was raised, typically __FILE__.
4133
4128
  * @param line The line number at which the exception was raised, typically __LINE__.
4134
- * @param kindOfObject The kind of object that could not be removed: "servant", "servant locator", "value factory", "plug-in", "object adapter", "object", or "user exception factory".
4129
+ * @param kindOfObject The kind of object that could not be removed: "servant", "facet", "object", "default servant", "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group".
4135
4130
  * @param id The ID (or name) of the object that could not be removed.
4136
4131
  */
4137
4132
  NotRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id);
@@ -4158,9 +4153,9 @@ public:
4158
4153
  virtual void ice_throw() const;
4159
4154
 
4160
4155
  /**
4161
- * The kind of object that could not be removed: "servant",
4162
- * "servant locator", "value factory", "plug-in",
4163
- * "object adapter", "object", or "user exception factory".
4156
+ * The kind of object that could not be removed: "servant", "facet",
4157
+ * "object", "default servant", "servant locator", "value factory", "plugin",
4158
+ * "object adapter", "object adapter with router", "replica group".
4164
4159
  */
4165
4160
  ::std::string kindOfObject;
4166
4161
  /**
@@ -4173,8 +4168,8 @@ public:
4173
4168
  * The operation can only be invoked with a twoway request.
4174
4169
  *
4175
4170
  * This exception is raised if an attempt is made to invoke an
4176
- * operation with <tt>ice_oneway</tt>, <tt>ice_batchOneway</tt>, <tt>ice_datagram</tt>,
4177
- * or <tt>ice_batchDatagram</tt> and the operation has a return value,
4171
+ * operation with <code>ice_oneway</code>, <code>ice_batchOneway</code>, <code>ice_datagram</code>,
4172
+ * or <code>ice_batchDatagram</code> and the operation has a return value,
4178
4173
  * out-parameters, or an exception specification.
4179
4174
  * \headerfile Ice/Ice.h
4180
4175
  */
@@ -4228,10 +4223,10 @@ public:
4228
4223
  * An attempt was made to clone a class that does not support
4229
4224
  * cloning.
4230
4225
  *
4231
- * This exception is raised if <tt>ice_clone</tt> is called on
4226
+ * This exception is raised if <code>ice_clone</code> is called on
4232
4227
  * a class that is derived from an abstract Slice class (that is,
4233
4228
  * a class containing operations), and the derived class does not
4234
- * provide an implementation of the <tt>ice_clone</tt> operation (C++ only).
4229
+ * provide an implementation of the <code>ice_clone</code> operation (C++ only).
4235
4230
  * \headerfile Ice/Ice.h
4236
4231
  */
4237
4232
  class ICE_API CloneNotImplementedException : public LocalException
@@ -4271,8 +4266,8 @@ public:
4271
4266
  * This exception is raised if an operation call on a server raises an
4272
4267
  * unknown exception. For example, for C++, this exception is raised
4273
4268
  * if the server throws a C++ exception that is not directly or
4274
- * indirectly derived from <tt>Ice::LocalException</tt> or
4275
- * <tt>Ice::UserException</tt>.
4269
+ * indirectly derived from <code>Ice::LocalException</code> or
4270
+ * <code>Ice::UserException</code>.
4276
4271
  * \headerfile Ice/Ice.h
4277
4272
  */
4278
4273
  class ICE_API UnknownException : public LocalException
@@ -4329,7 +4324,7 @@ public:
4329
4324
  * by the server as {@link UnknownLocalException}. The only exception to this
4330
4325
  * rule are all exceptions derived from {@link RequestFailedException},
4331
4326
  * which are transmitted by the Ice protocol even though they are
4332
- * declared <tt>local</tt>.
4327
+ * declared <code>local</code>.
4333
4328
  * \headerfile Ice/Ice.h
4334
4329
  */
4335
4330
  class ICE_API UnknownLocalException : public UnknownException
@@ -4378,13 +4373,13 @@ public:
4378
4373
  *
4379
4374
  * This exception is raised if an operation raises a
4380
4375
  * user exception that is not declared in the exception's
4381
- * <tt>throws</tt> clause. Such undeclared exceptions are
4376
+ * <code>throws</code> clause. Such undeclared exceptions are
4382
4377
  * not transmitted from the server to the client by the Ice
4383
4378
  * protocol, but instead the client just gets an
4384
4379
  * {@link UnknownUserException}. This is necessary in order to not violate
4385
4380
  * the contract established by an operation's signature: Only local
4386
4381
  * exceptions and user exceptions declared in the
4387
- * <tt>throws</tt> clause can be raised.
4382
+ * <code>throws</code> clause can be raised.
4388
4383
  * \headerfile Ice/Ice.h
4389
4384
  */
4390
4385
  class ICE_API UnknownUserException : public UnknownException
@@ -5021,7 +5016,7 @@ public:
5021
5016
  * This exception is raised if a request failed. This exception, and
5022
5017
  * all exceptions derived from {@link RequestFailedException}, are
5023
5018
  * transmitted by the Ice protocol, even though they are declared
5024
- * <tt>local</tt>.
5019
+ * <code>local</code>.
5025
5020
  * \headerfile Ice/Ice.h
5026
5021
  */
5027
5022
  class ICE_API RequestFailedException : public LocalException
@@ -5274,10 +5269,10 @@ public:
5274
5269
 
5275
5270
  /**
5276
5271
  * The error number describing the system exception. For C++ and
5277
- * Unix, this is equivalent to <tt>errno</tt>. For C++
5272
+ * Unix, this is equivalent to <code>errno</code>. For C++
5278
5273
  * and Windows, this is the value returned by
5279
- * <tt>GetLastError()</tt> or
5280
- * <tt>WSAGetLastError()</tt>.
5274
+ * <code>GetLastError()</code> or
5275
+ * <code>WSAGetLastError()</code>.
5281
5276
  */
5282
5277
  Int error;
5283
5278
  };
@@ -5613,9 +5608,9 @@ public:
5613
5608
 
5614
5609
  /**
5615
5610
  * The error number describing the DNS problem. For C++ and Unix,
5616
- * this is equivalent to <tt>h_errno</tt>. For C++ and
5611
+ * this is equivalent to <code>h_errno</code>. For C++ and
5617
5612
  * Windows, this is the value returned by
5618
- * <tt>WSAGetLastError()</tt>.
5613
+ * <code>WSAGetLastError()</code>.
5619
5614
  */
5620
5615
  Int error;
5621
5616
  /**
@@ -6783,7 +6778,7 @@ public:
6783
6778
  /**
6784
6779
  * This exception is raised when Ice receives a request or reply
6785
6780
  * message whose size exceeds the limit specified by the
6786
- * <tt>Ice.MessageSizeMax</tt> property.
6781
+ * <code>Ice.MessageSizeMax</code> property.
6787
6782
  * \headerfile Ice/Ice.h
6788
6783
  */
6789
6784
  class ICE_API MemoryLimitException : public MarshalException
@@ -1,13 +1,8 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
4
  //
8
- // **********************************************************************
9
- //
10
- // Ice version 3.7.1
5
+ // Ice version 3.7.2
11
6
  //
12
7
  // <auto-generated>
13
8
  //
@@ -50,7 +45,7 @@
50
45
  # if ICE_INT_VERSION % 100 > 50
51
46
  # error Beta header file detected
52
47
  # endif
53
- # if ICE_INT_VERSION % 100 < 1
48
+ # if ICE_INT_VERSION % 100 < 2
54
49
  # error Ice patch level mismatch!
55
50
  # endif
56
51
  #endif
@@ -575,7 +570,7 @@ public:
575
570
  ::std::function<void(bool)> sent = nullptr,
576
571
  const Context& context = noExplicitContext)
577
572
  {
578
- return _makeLamdaOutgoing<::std::shared_ptr<ObjectPrx>>(response, ex, sent, this, &LocatorPrx::_iceI_findObjectById, id, context);
573
+ return _makeLamdaOutgoing<::std::shared_ptr<ObjectPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_findObjectById, id, context);
579
574
  }
580
575
 
581
576
  /// \cond INTERNAL
@@ -627,7 +622,7 @@ public:
627
622
  ::std::function<void(bool)> sent = nullptr,
628
623
  const Context& context = noExplicitContext)
629
624
  {
630
- return _makeLamdaOutgoing<::std::shared_ptr<ObjectPrx>>(response, ex, sent, this, &LocatorPrx::_iceI_findAdapterById, id, context);
625
+ return _makeLamdaOutgoing<::std::shared_ptr<ObjectPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_findAdapterById, id, context);
631
626
  }
632
627
 
633
628
  /// \cond INTERNAL
@@ -670,7 +665,7 @@ public:
670
665
  ::std::function<void(bool)> sent = nullptr,
671
666
  const Context& context = noExplicitContext)
672
667
  {
673
- return _makeLamdaOutgoing<::std::shared_ptr<LocatorRegistryPrx>>(response, ex, sent, this, &LocatorPrx::_iceI_getRegistry, context);
668
+ return _makeLamdaOutgoing<::std::shared_ptr<LocatorRegistryPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_getRegistry, context);
674
669
  }
675
670
 
676
671
  /// \cond INTERNAL
@@ -761,7 +756,7 @@ public:
761
756
  ::std::function<void(bool)> sent = nullptr,
762
757
  const Context& context = noExplicitContext)
763
758
  {
764
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &LocatorRegistryPrx::_iceI_setAdapterDirectProxy, id, proxy, context);
759
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LocatorRegistryPrx::_iceI_setAdapterDirectProxy, id, proxy, context);
765
760
  }
766
761
 
767
762
  /// \cond INTERNAL
@@ -828,7 +823,7 @@ public:
828
823
  ::std::function<void(bool)> sent = nullptr,
829
824
  const Context& context = noExplicitContext)
830
825
  {
831
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &LocatorRegistryPrx::_iceI_setReplicatedAdapterDirectProxy, adapterId, replicaGroupId, p, context);
826
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LocatorRegistryPrx::_iceI_setReplicatedAdapterDirectProxy, adapterId, replicaGroupId, p, context);
832
827
  }
833
828
 
834
829
  /// \cond INTERNAL
@@ -879,7 +874,7 @@ public:
879
874
  ::std::function<void(bool)> sent = nullptr,
880
875
  const Context& context = noExplicitContext)
881
876
  {
882
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &LocatorRegistryPrx::_iceI_setServerProcessProxy, id, proxy, context);
877
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LocatorRegistryPrx::_iceI_setServerProcessProxy, id, proxy, context);
883
878
  }
884
879
 
885
880
  /// \cond INTERNAL
@@ -953,7 +948,7 @@ public:
953
948
  ::std::function<void(bool)> sent = nullptr,
954
949
  const Context& context = noExplicitContext)
955
950
  {
956
- return _makeLamdaOutgoing<::std::shared_ptr<LocatorPrx>>(response, ex, sent, this, &LocatorFinderPrx::_iceI_getLocator, context);
951
+ return _makeLamdaOutgoing<::std::shared_ptr<LocatorPrx>>(response, ex, sent, this, &Ice::LocatorFinderPrx::_iceI_getLocator, context);
957
952
  }
958
953
 
959
954
  /// \cond INTERNAL
@@ -1011,20 +1006,20 @@ namespace Ice
1011
1006
 
1012
1007
  class LocatorRegistry;
1013
1008
  /// \cond INTERNAL
1014
- ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry>&);
1015
- ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::LocatorRegistry*);
1009
+ ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LocatorRegistry>&);
1010
+ ICE_API ::IceProxy::Ice::Object* upCast(LocatorRegistry*);
1016
1011
  /// \endcond
1017
1012
 
1018
1013
  class Locator;
1019
1014
  /// \cond INTERNAL
1020
- ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator>&);
1021
- ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
1015
+ ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Locator>&);
1016
+ ICE_API ::IceProxy::Ice::Object* upCast(Locator*);
1022
1017
  /// \endcond
1023
1018
 
1024
1019
  class LocatorFinder;
1025
1020
  /// \cond INTERNAL
1026
- ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorFinder>&);
1027
- ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::LocatorFinder*);
1021
+ ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LocatorFinder>&);
1022
+ ICE_API ::IceProxy::Ice::Object* upCast(LocatorFinder*);
1028
1023
  /// \endcond
1029
1024
 
1030
1025
  }
@@ -1359,6 +1354,11 @@ namespace IceAsync
1359
1354
  namespace Ice
1360
1355
  {
1361
1356
 
1357
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1358
+ # pragma warning(push)
1359
+ # pragma warning(disable:4239)
1360
+ #endif
1361
+
1362
1362
  class ICE_API AMD_Locator_findObjectById : public ::Ice::AMD_Locator_findObjectById, public ::IceInternal::IncomingAsync
1363
1363
  {
1364
1364
  public:
@@ -1368,6 +1368,15 @@ public:
1368
1368
  virtual void ice_response(const ::Ice::ObjectPrx&);
1369
1369
  };
1370
1370
 
1371
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1372
+ # pragma warning(pop)
1373
+ #endif
1374
+
1375
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1376
+ # pragma warning(push)
1377
+ # pragma warning(disable:4239)
1378
+ #endif
1379
+
1371
1380
  class ICE_API AMD_Locator_findAdapterById : public ::Ice::AMD_Locator_findAdapterById, public ::IceInternal::IncomingAsync
1372
1381
  {
1373
1382
  public:
@@ -1377,6 +1386,15 @@ public:
1377
1386
  virtual void ice_response(const ::Ice::ObjectPrx&);
1378
1387
  };
1379
1388
 
1389
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1390
+ # pragma warning(pop)
1391
+ #endif
1392
+
1393
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1394
+ # pragma warning(push)
1395
+ # pragma warning(disable:4239)
1396
+ #endif
1397
+
1380
1398
  class ICE_API AMD_LocatorRegistry_setAdapterDirectProxy : public ::Ice::AMD_LocatorRegistry_setAdapterDirectProxy, public ::IceInternal::IncomingAsync
1381
1399
  {
1382
1400
  public:
@@ -1386,6 +1404,15 @@ public:
1386
1404
  virtual void ice_response();
1387
1405
  };
1388
1406
 
1407
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1408
+ # pragma warning(pop)
1409
+ #endif
1410
+
1411
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1412
+ # pragma warning(push)
1413
+ # pragma warning(disable:4239)
1414
+ #endif
1415
+
1389
1416
  class ICE_API AMD_LocatorRegistry_setReplicatedAdapterDirectProxy : public ::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy, public ::IceInternal::IncomingAsync
1390
1417
  {
1391
1418
  public:
@@ -1395,6 +1422,15 @@ public:
1395
1422
  virtual void ice_response();
1396
1423
  };
1397
1424
 
1425
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1426
+ # pragma warning(pop)
1427
+ #endif
1428
+
1429
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1430
+ # pragma warning(push)
1431
+ # pragma warning(disable:4239)
1432
+ #endif
1433
+
1398
1434
  class ICE_API AMD_LocatorRegistry_setServerProcessProxy : public ::Ice::AMD_LocatorRegistry_setServerProcessProxy, public ::IceInternal::IncomingAsync
1399
1435
  {
1400
1436
  public:
@@ -1404,6 +1440,10 @@ public:
1404
1440
  virtual void ice_response();
1405
1441
  };
1406
1442
 
1443
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1444
+ # pragma warning(pop)
1445
+ #endif
1446
+
1407
1447
  }
1408
1448
 
1409
1449
  }