zeroc-ice 3.7.0 → 3.7.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (684) hide show
  1. checksums.yaml +4 -4
  2. data/ICE_LICENSE +1 -1
  3. data/bin/slice2rb +1 -1
  4. data/ext/Communicator.cpp +72 -2
  5. data/ext/Communicator.h +1 -1
  6. data/ext/Config.h +11 -1
  7. data/ext/Connection.cpp +22 -2
  8. data/ext/Connection.h +4 -1
  9. data/ext/Endpoint.cpp +1 -1
  10. data/ext/Endpoint.h +1 -1
  11. data/ext/ImplicitContext.cpp +1 -1
  12. data/ext/ImplicitContext.h +1 -1
  13. data/ext/Init.cpp +1 -1
  14. data/ext/Logger.cpp +1 -1
  15. data/ext/Logger.h +1 -1
  16. data/ext/Operation.cpp +1 -1
  17. data/ext/Operation.h +1 -1
  18. data/ext/Properties.cpp +1 -1
  19. data/ext/Properties.h +1 -1
  20. data/ext/Proxy.cpp +70 -1
  21. data/ext/Proxy.h +1 -1
  22. data/ext/Slice.cpp +1 -1
  23. data/ext/Slice.h +1 -1
  24. data/ext/Types.cpp +21 -5
  25. data/ext/Types.h +1 -1
  26. data/ext/Util.cpp +1 -1
  27. data/ext/Util.h +1 -1
  28. data/ext/ValueFactoryManager.cpp +2 -2
  29. data/ext/ValueFactoryManager.h +2 -2
  30. data/ext/ice/cpp/include/Ice/Application.h +234 -76
  31. data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -1
  32. data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
  33. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -2
  34. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
  35. data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
  36. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +43 -1
  37. data/ext/ice/cpp/include/Ice/Comparable.h +81 -1
  38. data/ext/ice/cpp/include/Ice/Config.h +8 -1
  39. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -1
  40. data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -1
  41. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -1
  42. data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -1
  43. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +17 -2
  44. data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -2
  45. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -1
  46. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
  47. data/ext/ice/cpp/include/Ice/Exception.h +57 -15
  48. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +19 -1
  49. data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -2
  50. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
  51. data/ext/ice/cpp/include/Ice/Format.h +13 -14
  52. data/ext/ice/cpp/include/Ice/Functional.h +6 -1
  53. data/ext/ice/cpp/include/Ice/GCObject.h +1 -1
  54. data/ext/ice/cpp/include/Ice/Handle.h +1 -1
  55. data/ext/ice/cpp/include/Ice/Ice.h +1 -1
  56. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +38 -3
  57. data/ext/ice/cpp/include/Ice/Incoming.h +15 -2
  58. data/ext/ice/cpp/include/Ice/IncomingAsync.h +37 -4
  59. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
  60. data/ext/ice/cpp/include/Ice/Initialize.h +764 -98
  61. data/ext/ice/cpp/include/Ice/InputStream.h +637 -112
  62. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
  63. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -1
  64. data/ext/ice/cpp/include/Ice/LocalObject.h +5 -1
  65. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
  66. data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -6
  67. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +3 -1
  68. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -1
  69. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +3 -1
  70. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -23
  71. data/ext/ice/cpp/include/Ice/Object.h +338 -47
  72. data/ext/ice/cpp/include/Ice/ObjectF.h +5 -1
  73. data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
  74. data/ext/ice/cpp/include/Ice/Optional.h +22 -6
  75. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -1
  76. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -1
  77. data/ext/ice/cpp/include/Ice/OutputStream.h +436 -92
  78. data/ext/ice/cpp/include/Ice/Protocol.h +31 -1
  79. data/ext/ice/cpp/include/Ice/Proxy.h +2244 -190
  80. data/ext/ice/cpp/include/Ice/ProxyF.h +3 -1
  81. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
  82. data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -1
  83. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
  84. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -9
  85. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -1
  86. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -1
  87. data/ext/ice/cpp/include/Ice/SHA1.h +1 -1
  88. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
  89. data/ext/ice/cpp/include/Ice/Service.h +267 -138
  90. data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -1
  91. data/ext/ice/cpp/include/Ice/SlicedData.h +80 -33
  92. data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -1
  93. data/ext/ice/cpp/include/Ice/StreamHelpers.h +324 -116
  94. data/ext/ice/cpp/include/Ice/StringConverter.h +32 -1
  95. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
  96. data/ext/ice/cpp/include/Ice/UUID.h +2 -1
  97. data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -2
  98. data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -2
  99. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -1
  100. data/ext/ice/cpp/include/Ice/Value.h +41 -1
  101. data/ext/ice/cpp/include/Ice/ValueF.h +3 -1
  102. data/ext/ice/cpp/include/IceSSL/Config.h +1 -1
  103. data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
  104. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +75 -53
  105. data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -218
  106. data/ext/ice/cpp/include/IceSSL/SChannel.h +34 -27
  107. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +35 -28
  108. data/ext/ice/cpp/include/IceSSL/UWP.h +33 -24
  109. data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -1
  110. data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
  111. data/ext/ice/cpp/include/IceUtil/Config.h +11 -3
  112. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -1
  113. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
  114. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +59 -31
  115. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -1
  116. data/ext/ice/cpp/include/IceUtil/Exception.h +1 -1
  117. data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -1
  118. data/ext/ice/cpp/include/IceUtil/Functional.h +1 -1
  119. data/ext/ice/cpp/include/IceUtil/Handle.h +1 -1
  120. data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -1
  121. data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -1
  122. data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -1
  123. data/ext/ice/cpp/include/IceUtil/Lock.h +1 -1
  124. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -1
  125. data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -5
  126. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -1
  127. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -1
  128. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -1
  129. data/ext/ice/cpp/include/IceUtil/Optional.h +95 -1
  130. data/ext/ice/cpp/include/IceUtil/Options.h +1 -1
  131. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -1
  132. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
  133. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +1 -1
  134. data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
  135. data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -1
  136. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -4
  137. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +5 -3
  138. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
  139. data/ext/ice/cpp/include/IceUtil/Shared.h +1 -1
  140. data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -1
  141. data/ext/ice/cpp/include/IceUtil/StringConverter.h +106 -86
  142. data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -1
  143. data/ext/ice/cpp/include/IceUtil/Thread.h +1 -1
  144. data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -1
  145. data/ext/ice/cpp/include/IceUtil/Time.h +1 -1
  146. data/ext/ice/cpp/include/IceUtil/Timer.h +5 -1
  147. data/ext/ice/cpp/include/IceUtil/UUID.h +5 -1
  148. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
  149. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +80 -20
  150. data/ext/ice/cpp/include/generated/Ice/Communicator.h +927 -130
  151. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +13 -5
  152. data/ext/ice/cpp/include/generated/Ice/Connection.h +990 -194
  153. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +21 -9
  154. data/ext/ice/cpp/include/generated/Ice/Current.h +180 -17
  155. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +484 -118
  156. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +41 -17
  157. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +29 -3
  158. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +11 -5
  159. data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -7
  160. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +150 -28
  161. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +13 -5
  162. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +629 -83
  163. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +19 -7
  164. data/ext/ice/cpp/include/generated/Ice/LocalException.h +5104 -794
  165. data/ext/ice/cpp/include/generated/Ice/Locator.h +2222 -443
  166. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +27 -9
  167. data/ext/ice/cpp/include/generated/Ice/Logger.h +104 -26
  168. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +13 -5
  169. data/ext/ice/cpp/include/generated/Ice/Metrics.h +2534 -455
  170. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1004 -126
  171. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +13 -5
  172. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +72 -12
  173. data/ext/ice/cpp/include/generated/Ice/Plugin.h +142 -28
  174. data/ext/ice/cpp/include/generated/Ice/PluginF.h +17 -7
  175. data/ext/ice/cpp/include/generated/Ice/Process.h +511 -71
  176. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +18 -6
  177. data/ext/ice/cpp/include/generated/Ice/Properties.h +306 -58
  178. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +737 -121
  179. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +22 -8
  180. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1526 -279
  181. data/ext/ice/cpp/include/generated/Ice/Router.h +1009 -198
  182. data/ext/ice/cpp/include/generated/Ice/RouterF.h +18 -6
  183. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +174 -18
  184. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +13 -5
  185. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +13 -3
  186. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +177 -23
  187. data/ext/ice/cpp/include/generated/Ice/Version.h +43 -13
  188. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +71 -15
  189. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +13 -5
  190. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +39 -9
  191. data/ext/ice/cpp/src/Ice/ACM.cpp +12 -3
  192. data/ext/ice/cpp/src/Ice/ACM.h +1 -1
  193. data/ext/ice/cpp/src/Ice/ACMF.h +1 -1
  194. data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
  195. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
  196. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
  197. data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
  198. data/ext/ice/cpp/src/Ice/ArgVector.h +1 -1
  199. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
  200. data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
  201. data/ext/ice/cpp/src/Ice/Base64.h +1 -1
  202. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -1
  203. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -1
  204. data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -1
  205. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -3
  206. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +1 -1
  207. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
  208. data/ext/ice/cpp/src/Ice/Communicator.cpp +6 -4
  209. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -3
  210. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +34 -13
  211. data/ext/ice/cpp/src/Ice/CommunicatorI.h +10 -10
  212. data/ext/ice/cpp/src/Ice/Cond.cpp +1 -1
  213. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -6
  214. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -1
  216. data/ext/ice/cpp/src/Ice/Connection.cpp +27 -11
  217. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -3
  218. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +24 -19
  219. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +1 -1
  220. data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -1
  221. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +45 -37
  222. data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -8
  223. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -1
  224. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +1 -1
  225. data/ext/ice/cpp/src/Ice/Connector.cpp +1 -1
  226. data/ext/ice/cpp/src/Ice/Connector.h +1 -1
  227. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
  228. data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -1
  229. data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
  230. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -7
  231. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
  233. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -1
  234. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
  235. data/ext/ice/cpp/src/Ice/Endpoint.cpp +24 -10
  236. data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -3
  237. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -1
  238. data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -1
  239. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
  240. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +7 -13
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -1
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
  243. data/ext/ice/cpp/src/Ice/EndpointI.cpp +2 -2
  244. data/ext/ice/cpp/src/Ice/EndpointI.h +5 -5
  245. data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
  246. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -3
  247. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
  248. data/ext/ice/cpp/src/Ice/EventHandler.h +1 -1
  249. data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
  250. data/ext/ice/cpp/src/Ice/Exception.cpp +1 -1
  251. data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -3
  252. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
  253. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -1
  254. data/ext/ice/cpp/src/Ice/GCObject.cpp +1 -1
  255. data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
  256. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -1
  257. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
  258. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +24 -29
  259. data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -5
  260. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
  261. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -1
  262. data/ext/ice/cpp/src/Ice/Identity.cpp +3 -3
  263. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +6 -4
  264. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -3
  265. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -13
  266. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
  267. data/ext/ice/cpp/src/Ice/Incoming.cpp +1 -1
  268. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -1
  269. data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -1
  270. data/ext/ice/cpp/src/Ice/Initialize.cpp +10 -16
  271. data/ext/ice/cpp/src/Ice/InputStream.cpp +1 -1
  272. data/ext/ice/cpp/src/Ice/Instance.cpp +13 -34
  273. data/ext/ice/cpp/src/Ice/Instance.h +1 -1
  274. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +33 -13
  275. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -3
  276. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +1 -1
  277. data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -1
  278. data/ext/ice/cpp/src/Ice/LocalException.cpp +279 -279
  279. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
  280. data/ext/ice/cpp/src/Ice/Locator.cpp +287 -174
  281. data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
  282. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +4 -9
  283. data/ext/ice/cpp/src/Ice/LocatorInfo.h +1 -1
  284. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
  285. data/ext/ice/cpp/src/Ice/Logger.cpp +6 -4
  286. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -1
  287. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -1
  288. data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -3
  289. data/ext/ice/cpp/src/Ice/LoggerI.cpp +1 -1
  290. data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
  291. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -1
  292. data/ext/ice/cpp/src/Ice/Metrics.cpp +297 -109
  293. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +2 -7
  294. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
  295. data/ext/ice/cpp/src/Ice/Network.cpp +188 -225
  296. data/ext/ice/cpp/src/Ice/Network.h +3 -12
  297. data/ext/ice/cpp/src/Ice/NetworkF.h +1 -1
  298. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +1 -1
  299. data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -1
  300. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
  301. data/ext/ice/cpp/src/Ice/Object.cpp +7 -4
  302. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +6 -4
  303. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -3
  304. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -19
  305. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -1
  306. data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -1
  307. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +116 -150
  308. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +11 -11
  309. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +6 -4
  310. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
  311. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +25 -42
  312. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -2
  313. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
  314. data/ext/ice/cpp/src/Ice/OutputStream.cpp +1 -1
  315. data/ext/ice/cpp/src/Ice/Plugin.cpp +9 -5
  316. data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -3
  317. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -34
  318. data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -3
  319. data/ext/ice/cpp/src/Ice/Process.cpp +69 -40
  320. data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -3
  321. data/ext/ice/cpp/src/Ice/Properties.cpp +6 -4
  322. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +89 -54
  323. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +1 -1
  324. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -1
  325. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -3
  326. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +15 -21
  327. data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -10
  328. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +4 -2
  329. data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
  330. data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -13
  331. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -1
  332. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -1
  333. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
  334. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -1
  335. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -1
  336. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
  337. data/ext/ice/cpp/src/Ice/Proxy.cpp +46 -1
  338. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
  339. data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -1
  340. data/ext/ice/cpp/src/Ice/Reference.cpp +56 -6
  341. data/ext/ice/cpp/src/Ice/Reference.h +13 -2
  342. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +51 -90
  343. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -1
  344. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
  345. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -1
  346. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
  347. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +203 -117
  348. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
  349. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -1
  350. data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -1
  351. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -1
  352. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -1
  353. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
  354. data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -1
  355. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +1 -1
  356. data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -1
  357. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
  358. data/ext/ice/cpp/src/Ice/Router.cpp +167 -89
  359. data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
  360. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +6 -28
  361. data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -3
  362. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
  363. data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -1
  364. data/ext/ice/cpp/src/Ice/Selector.cpp +19 -26
  365. data/ext/ice/cpp/src/Ice/Selector.h +1 -1
  366. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +6 -4
  367. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -3
  368. data/ext/ice/cpp/src/Ice/ServantManager.cpp +15 -31
  369. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
  370. data/ext/ice/cpp/src/Ice/SharedContext.h +1 -1
  371. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -3
  372. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -1
  373. data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -1
  374. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +32 -52
  375. data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -1
  376. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -1
  377. data/ext/ice/cpp/src/Ice/StringUtil.h +1 -1
  378. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +1 -1
  379. data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -1
  380. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +5 -13
  381. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -1
  382. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -1
  383. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -1
  384. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +8 -11
  385. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -2
  386. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -1
  387. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -1
  388. data/ext/ice/cpp/src/Ice/Thread.cpp +1 -1
  389. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +13 -13
  390. data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
  391. data/ext/ice/cpp/src/Ice/Timer.cpp +1 -1
  392. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -1
  393. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
  394. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -1
  395. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -1
  396. data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -1
  397. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -1
  398. data/ext/ice/cpp/src/Ice/Transceiver.h +1 -1
  399. data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
  400. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +1 -1
  401. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -1
  402. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +19 -27
  403. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -2
  404. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +17 -54
  405. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -1
  406. data/ext/ice/cpp/src/Ice/Value.cpp +1 -1
  407. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +9 -5
  408. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -6
  409. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -2
  410. data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
  411. data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -1
  412. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -1
  413. data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -1
  414. data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -1
  415. data/ext/ice/cpp/src/Ice/WSConnector.h +1 -1
  416. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +4 -5
  417. data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -2
  418. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +8 -9
  419. data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -1
  420. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +85 -27
  421. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +599 -113
  422. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
  423. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
  424. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +1 -1
  425. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
  426. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -1
  427. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
  428. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +70 -24
  429. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +635 -69
  430. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -1
  431. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +71 -9
  432. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -4
  433. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
  434. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -1
  435. data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -1
  436. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +6 -4
  437. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -3
  438. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -4
  439. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
  440. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +2 -2
  441. data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -2
  442. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +6 -4
  443. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -1
  444. data/ext/ice/cpp/src/IceSSL/Instance.h +1 -1
  445. data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -1
  446. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -1
  447. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +1 -1
  448. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +1 -1
  449. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -1
  450. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -1
  451. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +25 -62
  452. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -1
  453. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -1
  454. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -1
  455. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -1
  456. data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -1
  457. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -1
  458. data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -1
  459. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +1 -1
  460. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +1 -1
  461. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +1 -1
  462. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +1 -1
  463. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -1
  464. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +19 -27
  465. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -1
  466. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +7 -16
  467. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -1
  468. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
  469. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +1 -1
  470. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +1 -1
  471. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +1 -1
  472. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +1 -1
  473. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -1
  474. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
  475. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -1
  476. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +7 -10
  477. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +1 -1
  478. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -5
  479. data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -1
  480. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -1
  481. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +1 -1
  482. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +1 -1
  483. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -1
  484. data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -1
  485. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -1
  486. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +1 -1
  487. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -1
  488. data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
  489. data/ext/ice/cpp/src/IceSSL/Util.h +1 -1
  490. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -1
  491. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
  492. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
  493. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
  494. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +5 -5
  495. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
  496. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
  497. data/ext/ice/cpp/src/IceUtil/Options.cpp +1 -1
  498. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -1
  499. data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -1
  500. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +1 -5
  501. data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -1
  502. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -1
  503. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +1 -1
  504. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -1
  505. data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
  506. data/ext/ice/cpp/src/IceUtil/UUID.cpp +3 -3
  507. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -1
  508. data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -1
  509. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +1 -1
  510. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +160 -150
  511. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +9 -8
  512. data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
  513. data/ext/ice/cpp/src/Slice/Checksum.h +1 -1
  514. data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
  515. data/ext/ice/cpp/src/Slice/FileTracker.h +1 -1
  516. data/ext/ice/cpp/src/Slice/Grammar.cpp +567 -585
  517. data/ext/ice/cpp/src/Slice/Grammar.h +2 -2
  518. data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
  519. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +131 -47
  520. data/ext/ice/cpp/src/Slice/JavaUtil.h +10 -5
  521. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
  522. data/ext/ice/cpp/src/Slice/MD5.h +1 -1
  523. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +1 -1
  524. data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -1
  525. data/ext/ice/cpp/src/Slice/Parser.cpp +383 -101
  526. data/ext/ice/cpp/src/Slice/Parser.h +40 -3
  527. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +2 -1
  528. data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -2
  529. data/ext/ice/cpp/src/Slice/Python.cpp +7 -15
  530. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +66 -9
  531. data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -2
  532. data/ext/ice/cpp/src/Slice/Ruby.cpp +1 -1
  533. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +2 -2
  534. data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -1
  535. data/ext/ice/cpp/src/Slice/Scanner.cpp +214 -135
  536. data/ext/ice/cpp/src/Slice/SliceUtil.cpp +1 -1
  537. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +99 -17
  538. data/ext/ice/cpp/src/Slice/Util.h +5 -4
  539. data/ice.gemspec +2 -2
  540. data/lib/Glacier2.rb +1 -1
  541. data/lib/Glacier2/Metrics.rb +2 -2
  542. data/lib/Glacier2/PermissionsVerifier.rb +2 -2
  543. data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
  544. data/lib/Glacier2/Router.rb +2 -2
  545. data/lib/Glacier2/RouterF.rb +2 -2
  546. data/lib/Glacier2/SSLInfo.rb +2 -2
  547. data/lib/Glacier2/Session.rb +2 -2
  548. data/lib/Ice.rb +2 -2
  549. data/lib/Ice/BuiltinSequences.rb +2 -2
  550. data/lib/Ice/Communicator.rb +2 -2
  551. data/lib/Ice/CommunicatorF.rb +2 -2
  552. data/lib/Ice/Connection.rb +2 -2
  553. data/lib/Ice/ConnectionF.rb +2 -2
  554. data/lib/Ice/Current.rb +2 -2
  555. data/lib/Ice/Endpoint.rb +2 -2
  556. data/lib/Ice/EndpointF.rb +2 -2
  557. data/lib/Ice/EndpointTypes.rb +2 -2
  558. data/lib/Ice/FacetMap.rb +2 -2
  559. data/lib/Ice/Identity.rb +2 -2
  560. data/lib/Ice/ImplicitContext.rb +2 -2
  561. data/lib/Ice/ImplicitContextF.rb +2 -2
  562. data/lib/Ice/Instrumentation.rb +2 -2
  563. data/lib/Ice/InstrumentationF.rb +2 -2
  564. data/lib/Ice/LocalException.rb +2 -2
  565. data/lib/Ice/Locator.rb +2 -2
  566. data/lib/Ice/LocatorF.rb +2 -2
  567. data/lib/Ice/Logger.rb +2 -2
  568. data/lib/Ice/LoggerF.rb +2 -2
  569. data/lib/Ice/Metrics.rb +2 -2
  570. data/lib/Ice/ObjectAdapter.rb +2 -2
  571. data/lib/Ice/ObjectAdapterF.rb +2 -2
  572. data/lib/Ice/ObjectFactory.rb +2 -2
  573. data/lib/Ice/Plugin.rb +2 -2
  574. data/lib/Ice/PluginF.rb +2 -2
  575. data/lib/Ice/Process.rb +2 -2
  576. data/lib/Ice/ProcessF.rb +2 -2
  577. data/lib/Ice/Properties.rb +2 -2
  578. data/lib/Ice/PropertiesAdmin.rb +2 -2
  579. data/lib/Ice/PropertiesF.rb +2 -2
  580. data/lib/Ice/RemoteLogger.rb +2 -2
  581. data/lib/Ice/Router.rb +2 -2
  582. data/lib/Ice/RouterF.rb +2 -2
  583. data/lib/Ice/ServantLocator.rb +2 -2
  584. data/lib/Ice/ServantLocatorF.rb +2 -2
  585. data/lib/Ice/SliceChecksumDict.rb +2 -2
  586. data/lib/Ice/ValueFactory.rb +2 -2
  587. data/lib/Ice/Version.rb +2 -2
  588. data/lib/IceBox.rb +1 -1
  589. data/lib/IceBox/IceBox.rb +2 -2
  590. data/lib/IceGrid.rb +1 -1
  591. data/lib/IceGrid/Admin.rb +2 -2
  592. data/lib/IceGrid/Descriptor.rb +2 -2
  593. data/lib/IceGrid/Exception.rb +2 -2
  594. data/lib/IceGrid/FileParser.rb +2 -2
  595. data/lib/IceGrid/PluginFacade.rb +2 -2
  596. data/lib/IceGrid/Registry.rb +2 -2
  597. data/lib/IceGrid/Session.rb +2 -2
  598. data/lib/IceGrid/UserAccountMapper.rb +2 -2
  599. data/lib/IcePatch2.rb +1 -1
  600. data/lib/IcePatch2/FileInfo.rb +2 -2
  601. data/lib/IcePatch2/FileServer.rb +2 -2
  602. data/lib/IceStorm.rb +1 -1
  603. data/lib/IceStorm/IceStorm.rb +2 -2
  604. data/lib/IceStorm/Metrics.rb +2 -2
  605. data/slice/Glacier2/Metrics.ice +2 -2
  606. data/slice/Glacier2/PermissionsVerifier.ice +2 -2
  607. data/slice/Glacier2/PermissionsVerifierF.ice +2 -2
  608. data/slice/Glacier2/Router.ice +2 -2
  609. data/slice/Glacier2/RouterF.ice +2 -2
  610. data/slice/Glacier2/SSLInfo.ice +2 -2
  611. data/slice/Glacier2/Session.ice +2 -2
  612. data/slice/Ice/BuiltinSequences.ice +2 -2
  613. data/slice/Ice/Communicator.ice +66 -73
  614. data/slice/Ice/CommunicatorF.ice +2 -2
  615. data/slice/Ice/Connection.ice +47 -17
  616. data/slice/Ice/ConnectionF.ice +2 -2
  617. data/slice/Ice/Current.ice +4 -5
  618. data/slice/Ice/Endpoint.ice +16 -16
  619. data/slice/Ice/EndpointF.ice +2 -2
  620. data/slice/Ice/EndpointTypes.ice +2 -2
  621. data/slice/Ice/FacetMap.ice +2 -2
  622. data/slice/Ice/Identity.ice +2 -2
  623. data/slice/Ice/ImplicitContext.ice +6 -6
  624. data/slice/Ice/ImplicitContextF.ice +2 -2
  625. data/slice/Ice/Instrumentation.ice +2 -2
  626. data/slice/Ice/InstrumentationF.ice +2 -2
  627. data/slice/Ice/LocalException.ice +2 -2
  628. data/slice/Ice/Locator.ice +3 -3
  629. data/slice/Ice/LocatorF.ice +2 -2
  630. data/slice/Ice/Logger.ice +2 -2
  631. data/slice/Ice/LoggerF.ice +2 -2
  632. data/slice/Ice/Metrics.ice +2 -2
  633. data/slice/Ice/ObjectAdapter.ice +10 -10
  634. data/slice/Ice/ObjectAdapterF.ice +2 -2
  635. data/slice/Ice/ObjectFactory.ice +3 -3
  636. data/slice/Ice/Plugin.ice +4 -4
  637. data/slice/Ice/PluginF.ice +2 -2
  638. data/slice/Ice/Process.ice +2 -2
  639. data/slice/Ice/ProcessF.ice +2 -2
  640. data/slice/Ice/Properties.ice +11 -11
  641. data/slice/Ice/PropertiesAdmin.ice +2 -2
  642. data/slice/Ice/PropertiesF.ice +2 -2
  643. data/slice/Ice/RemoteLogger.ice +12 -23
  644. data/slice/Ice/Router.ice +2 -2
  645. data/slice/Ice/RouterF.ice +2 -2
  646. data/slice/Ice/ServantLocator.ice +2 -2
  647. data/slice/Ice/ServantLocatorF.ice +2 -2
  648. data/slice/Ice/SliceChecksumDict.ice +2 -2
  649. data/slice/Ice/ValueFactory.ice +14 -16
  650. data/slice/Ice/Version.ice +2 -2
  651. data/slice/IceBT/ConnectionInfo.ice +2 -2
  652. data/slice/IceBT/EndpointInfo.ice +2 -2
  653. data/slice/IceBT/Types.ice +2 -2
  654. data/slice/IceBox/IceBox.ice +3 -4
  655. data/slice/IceDiscovery/IceDiscovery.ice +2 -2
  656. data/slice/IceGrid/Admin.ice +2 -2
  657. data/slice/IceGrid/Descriptor.ice +2 -2
  658. data/slice/IceGrid/Exception.ice +2 -2
  659. data/slice/IceGrid/FileParser.ice +2 -2
  660. data/slice/IceGrid/PluginFacade.ice +6 -6
  661. data/slice/IceGrid/Registry.ice +2 -2
  662. data/slice/IceGrid/Session.ice +2 -2
  663. data/slice/IceGrid/UserAccountMapper.ice +2 -2
  664. data/slice/IceIAP/ConnectionInfo.ice +2 -2
  665. data/slice/IceIAP/EndpointInfo.ice +2 -2
  666. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +2 -2
  667. data/slice/IcePatch2/FileInfo.ice +2 -2
  668. data/slice/IcePatch2/FileServer.ice +2 -2
  669. data/slice/IceSSL/ConnectionInfo.ice +2 -2
  670. data/slice/IceSSL/ConnectionInfoF.ice +2 -2
  671. data/slice/IceSSL/EndpointInfo.ice +2 -2
  672. data/slice/IceStorm/IceStorm.ice +5 -6
  673. data/slice/IceStorm/Metrics.ice +2 -2
  674. metadata +3 -13
  675. data/BZIP2_LICENSE +0 -42
  676. data/ext/ice/bzip2/blocksort.c +0 -1094
  677. data/ext/ice/bzip2/bzlib.c +0 -1572
  678. data/ext/ice/bzip2/bzlib.h +0 -282
  679. data/ext/ice/bzip2/bzlib_private.h +0 -509
  680. data/ext/ice/bzip2/compress.c +0 -672
  681. data/ext/ice/bzip2/crctable.c +0 -104
  682. data/ext/ice/bzip2/decompress.c +0 -646
  683. data/ext/ice/bzip2/huffman.c +0 -205
  684. data/ext/ice/bzip2/randtable.c +0 -84
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,13 +1,13 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.7.0
10
+ // Ice version 3.7.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -43,7 +43,7 @@
43
43
  # if ICE_INT_VERSION % 100 > 50
44
44
  # error Beta header file detected
45
45
  # endif
46
- # if ICE_INT_VERSION % 100 < 0
46
+ # if ICE_INT_VERSION % 100 < 1
47
47
  # error Ice patch level mismatch!
48
48
  # endif
49
49
  #endif
@@ -110,6 +110,7 @@ IceLocatorDiscovery::LookupReply::ice_staticId()
110
110
  return typeId;
111
111
  }
112
112
 
113
+ /// \cond INTERNAL
113
114
  bool
114
115
  IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
115
116
  {
@@ -122,7 +123,9 @@ IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& in
122
123
  inS.writeEmptyParams();
123
124
  return true;
124
125
  }
126
+ /// \endcond
125
127
 
128
+ /// \cond INTERNAL
126
129
  bool
127
130
  IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
128
131
  {
@@ -161,6 +164,7 @@ IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, cons
161
164
  }
162
165
  }
163
166
  }
167
+ /// \endcond
164
168
 
165
169
  bool
166
170
  IceLocatorDiscovery::Lookup::ice_isA(::std::string s, const ::Ice::Current&) const
@@ -187,20 +191,23 @@ IceLocatorDiscovery::Lookup::ice_staticId()
187
191
  return typeId;
188
192
  }
189
193
 
194
+ /// \cond INTERNAL
190
195
  bool
191
196
  IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
192
197
  {
193
198
  _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
194
199
  auto istr = inS.startReadParams();
195
200
  ::std::string iceP_instanceName;
196
- ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx> iceP_reply;
201
+ ::std::shared_ptr<LookupReplyPrx> iceP_reply;
197
202
  istr->readAll(iceP_instanceName, iceP_reply);
198
203
  inS.endReadParams();
199
204
  this->findLocator(::std::move(iceP_instanceName), ::std::move(iceP_reply), current);
200
205
  inS.writeEmptyParams();
201
206
  return true;
202
207
  }
208
+ /// \endcond
203
209
 
210
+ /// \cond INTERNAL
204
211
  bool
205
212
  IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
206
213
  {
@@ -239,7 +246,9 @@ IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::I
239
246
  }
240
247
  }
241
248
  }
249
+ /// \endcond
242
250
 
251
+ /// \cond INTERNAL
243
252
  void
244
253
  IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context)
245
254
  {
@@ -250,21 +259,25 @@ IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator(const ::std::shared_ptr<
250
259
  },
251
260
  nullptr);
252
261
  }
262
+ /// \endcond
253
263
 
264
+ /// \cond INTERNAL
254
265
  ::std::shared_ptr<::Ice::ObjectPrx>
255
266
  IceLocatorDiscovery::LookupReplyPrx::_newInstance() const
256
267
  {
257
268
  return ::IceInternal::createProxy<LookupReplyPrx>();
258
269
  }
270
+ /// \endcond
259
271
 
260
272
  const ::std::string&
261
273
  IceLocatorDiscovery::LookupReplyPrx::ice_staticId()
262
274
  {
263
- return IceLocatorDiscovery::LookupReply::ice_staticId();
275
+ return LookupReply::ice_staticId();
264
276
  }
265
277
 
278
+ /// \cond INTERNAL
266
279
  void
267
- IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
280
+ IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_instanceName, const ::std::shared_ptr<LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
268
281
  {
269
282
  outAsync->invoke(iceC_IceLocatorDiscovery_Lookup_findLocator_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
270
283
  [&](::Ice::OutputStream* ostr)
@@ -273,17 +286,20 @@ IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceI
273
286
  },
274
287
  nullptr);
275
288
  }
289
+ /// \endcond
276
290
 
291
+ /// \cond INTERNAL
277
292
  ::std::shared_ptr<::Ice::ObjectPrx>
278
293
  IceLocatorDiscovery::LookupPrx::_newInstance() const
279
294
  {
280
295
  return ::IceInternal::createProxy<LookupPrx>();
281
296
  }
297
+ /// \endcond
282
298
 
283
299
  const ::std::string&
284
300
  IceLocatorDiscovery::LookupPrx::ice_staticId()
285
301
  {
286
- return IceLocatorDiscovery::Lookup::ice_staticId();
302
+ return Lookup::ice_staticId();
287
303
  }
288
304
 
289
305
  #else // C++98 mapping
@@ -296,10 +312,12 @@ const ::std::string iceC_IceLocatorDiscovery_LookupReply_foundLocator_name = "fo
296
312
  const ::std::string iceC_IceLocatorDiscovery_Lookup_findLocator_name = "findLocator";
297
313
 
298
314
  }
299
- ::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(::IceProxy::IceLocatorDiscovery::LookupReply* p) { return p; }
315
+
316
+ /// \cond INTERNAL
317
+ ::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(LookupReply* p) { return p; }
300
318
 
301
319
  void
302
- ::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>& v)
320
+ ::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LookupReply>& v)
303
321
  {
304
322
  ::Ice::ObjectPrx proxy;
305
323
  istr->read(proxy);
@@ -309,10 +327,11 @@ void
309
327
  }
310
328
  else
311
329
  {
312
- v = new ::IceProxy::IceLocatorDiscovery::LookupReply;
330
+ v = new LookupReply;
313
331
  v->_copyFrom(proxy);
314
332
  }
315
333
  }
334
+ /// \endcond
316
335
 
317
336
  ::Ice::AsyncResultPtr
318
337
  IceProxy::IceLocatorDiscovery::LookupReply::_iceI_begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -339,21 +358,25 @@ IceProxy::IceLocatorDiscovery::LookupReply::end_foundLocator(const ::Ice::AsyncR
339
358
  _end(result, iceC_IceLocatorDiscovery_LookupReply_foundLocator_name);
340
359
  }
341
360
 
361
+ /// \cond INTERNAL
342
362
  ::IceProxy::Ice::Object*
343
363
  IceProxy::IceLocatorDiscovery::LookupReply::_newInstance() const
344
364
  {
345
365
  return new LookupReply;
346
366
  }
367
+ /// \endcond
347
368
 
348
369
  const ::std::string&
349
370
  IceProxy::IceLocatorDiscovery::LookupReply::ice_staticId()
350
371
  {
351
372
  return ::IceLocatorDiscovery::LookupReply::ice_staticId();
352
373
  }
353
- ::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(::IceProxy::IceLocatorDiscovery::Lookup* p) { return p; }
374
+
375
+ /// \cond INTERNAL
376
+ ::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(Lookup* p) { return p; }
354
377
 
355
378
  void
356
- ::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>& v)
379
+ ::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Lookup>& v)
357
380
  {
358
381
  ::Ice::ObjectPrx proxy;
359
382
  istr->read(proxy);
@@ -363,10 +386,11 @@ void
363
386
  }
364
387
  else
365
388
  {
366
- v = new ::IceProxy::IceLocatorDiscovery::Lookup;
389
+ v = new Lookup;
367
390
  v->_copyFrom(proxy);
368
391
  }
369
392
  }
393
+ /// \endcond
370
394
 
371
395
  ::Ice::AsyncResultPtr
372
396
  IceProxy::IceLocatorDiscovery::Lookup::_iceI_begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -394,11 +418,13 @@ IceProxy::IceLocatorDiscovery::Lookup::end_findLocator(const ::Ice::AsyncResultP
394
418
  _end(result, iceC_IceLocatorDiscovery_Lookup_findLocator_name);
395
419
  }
396
420
 
421
+ /// \cond INTERNAL
397
422
  ::IceProxy::Ice::Object*
398
423
  IceProxy::IceLocatorDiscovery::Lookup::_newInstance() const
399
424
  {
400
425
  return new Lookup;
401
426
  }
427
+ /// \endcond
402
428
 
403
429
  const ::std::string&
404
430
  IceProxy::IceLocatorDiscovery::Lookup::ice_staticId()
@@ -410,8 +436,10 @@ IceLocatorDiscovery::LookupReply::~LookupReply()
410
436
  {
411
437
  }
412
438
 
413
- ::Ice::Object* IceLocatorDiscovery::upCast(::IceLocatorDiscovery::LookupReply* p) { return p; }
439
+ /// \cond INTERNAL
440
+ ::Ice::Object* IceLocatorDiscovery::upCast(LookupReply* p) { return p; }
414
441
 
442
+ /// \endcond
415
443
 
416
444
  namespace
417
445
  {
@@ -452,6 +480,7 @@ IceLocatorDiscovery::LookupReply::ice_staticId()
452
480
  #endif
453
481
  }
454
482
 
483
+ /// \cond INTERNAL
455
484
  bool
456
485
  IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
457
486
  {
@@ -464,6 +493,7 @@ IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& in
464
493
  inS.writeEmptyParams();
465
494
  return true;
466
495
  }
496
+ /// \endcond
467
497
 
468
498
  namespace
469
499
  {
@@ -478,6 +508,7 @@ const ::std::string iceC_IceLocatorDiscovery_LookupReply_all[] =
478
508
 
479
509
  }
480
510
 
511
+ /// \cond INTERNAL
481
512
  bool
482
513
  IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
483
514
  {
@@ -516,12 +547,14 @@ IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, cons
516
547
  }
517
548
  }
518
549
  }
550
+ /// \endcond
519
551
 
552
+ /// \cond STREAM
520
553
  void
521
554
  IceLocatorDiscovery::LookupReply::_iceWriteImpl(::Ice::OutputStream* ostr) const
522
555
  {
523
556
  ostr->startSlice(ice_staticId(), -1, true);
524
- Ice::StreamWriter< ::IceLocatorDiscovery::LookupReply, ::Ice::OutputStream>::write(ostr, *this);
557
+ ::Ice::StreamWriter< LookupReply, ::Ice::OutputStream>::write(ostr, *this);
525
558
  ostr->endSlice();
526
559
  }
527
560
 
@@ -529,26 +562,31 @@ void
529
562
  IceLocatorDiscovery::LookupReply::_iceReadImpl(::Ice::InputStream* istr)
530
563
  {
531
564
  istr->startSlice();
532
- Ice::StreamReader< ::IceLocatorDiscovery::LookupReply, ::Ice::InputStream>::read(istr, *this);
565
+ ::Ice::StreamReader< LookupReply, ::Ice::InputStream>::read(istr, *this);
533
566
  istr->endSlice();
534
567
  }
568
+ /// \endcond
535
569
 
570
+ /// \cond INTERNAL
536
571
  void
537
572
  IceLocatorDiscovery::_icePatchObjectPtr(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
538
573
  {
539
- handle = ::IceLocatorDiscovery::LookupReplyPtr::dynamicCast(v);
574
+ handle = LookupReplyPtr::dynamicCast(v);
540
575
  if(v && !handle)
541
576
  {
542
- IceInternal::Ex::throwUOE(::IceLocatorDiscovery::LookupReply::ice_staticId(), v);
577
+ IceInternal::Ex::throwUOE(LookupReply::ice_staticId(), v);
543
578
  }
544
579
  }
580
+ /// \endcond
545
581
 
546
582
  IceLocatorDiscovery::Lookup::~Lookup()
547
583
  {
548
584
  }
549
585
 
550
- ::Ice::Object* IceLocatorDiscovery::upCast(::IceLocatorDiscovery::Lookup* p) { return p; }
586
+ /// \cond INTERNAL
587
+ ::Ice::Object* IceLocatorDiscovery::upCast(Lookup* p) { return p; }
551
588
 
589
+ /// \endcond
552
590
 
553
591
  namespace
554
592
  {
@@ -589,13 +627,14 @@ IceLocatorDiscovery::Lookup::ice_staticId()
589
627
  #endif
590
628
  }
591
629
 
630
+ /// \cond INTERNAL
592
631
  bool
593
632
  IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
594
633
  {
595
634
  _iceCheckMode(::Ice::Idempotent, current.mode);
596
635
  ::Ice::InputStream* istr = inS.startReadParams();
597
636
  ::std::string iceP_instanceName;
598
- ::IceLocatorDiscovery::LookupReplyPrx iceP_reply;
637
+ LookupReplyPrx iceP_reply;
599
638
  istr->read(iceP_instanceName);
600
639
  istr->read(iceP_reply);
601
640
  inS.endReadParams();
@@ -603,6 +642,7 @@ IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, con
603
642
  inS.writeEmptyParams();
604
643
  return true;
605
644
  }
645
+ /// \endcond
606
646
 
607
647
  namespace
608
648
  {
@@ -617,6 +657,7 @@ const ::std::string iceC_IceLocatorDiscovery_Lookup_all[] =
617
657
 
618
658
  }
619
659
 
660
+ /// \cond INTERNAL
620
661
  bool
621
662
  IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
622
663
  {
@@ -655,12 +696,14 @@ IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::I
655
696
  }
656
697
  }
657
698
  }
699
+ /// \endcond
658
700
 
701
+ /// \cond STREAM
659
702
  void
660
703
  IceLocatorDiscovery::Lookup::_iceWriteImpl(::Ice::OutputStream* ostr) const
661
704
  {
662
705
  ostr->startSlice(ice_staticId(), -1, true);
663
- Ice::StreamWriter< ::IceLocatorDiscovery::Lookup, ::Ice::OutputStream>::write(ostr, *this);
706
+ ::Ice::StreamWriter< Lookup, ::Ice::OutputStream>::write(ostr, *this);
664
707
  ostr->endSlice();
665
708
  }
666
709
 
@@ -668,19 +711,22 @@ void
668
711
  IceLocatorDiscovery::Lookup::_iceReadImpl(::Ice::InputStream* istr)
669
712
  {
670
713
  istr->startSlice();
671
- Ice::StreamReader< ::IceLocatorDiscovery::Lookup, ::Ice::InputStream>::read(istr, *this);
714
+ ::Ice::StreamReader< Lookup, ::Ice::InputStream>::read(istr, *this);
672
715
  istr->endSlice();
673
716
  }
717
+ /// \endcond
674
718
 
719
+ /// \cond INTERNAL
675
720
  void
676
721
  IceLocatorDiscovery::_icePatchObjectPtr(LookupPtr& handle, const ::Ice::ObjectPtr& v)
677
722
  {
678
- handle = ::IceLocatorDiscovery::LookupPtr::dynamicCast(v);
723
+ handle = LookupPtr::dynamicCast(v);
679
724
  if(v && !handle)
680
725
  {
681
- IceInternal::Ex::throwUOE(::IceLocatorDiscovery::Lookup::ice_staticId(), v);
726
+ IceInternal::Ex::throwUOE(Lookup::ice_staticId(), v);
682
727
  }
683
728
  }
729
+ /// \endcond
684
730
 
685
731
  namespace Ice
686
732
  {
@@ -1,13 +1,13 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.7.0
10
+ // Ice version 3.7.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -49,7 +49,7 @@
49
49
  # if ICE_INT_VERSION % 100 > 50
50
50
  # error Beta header file detected
51
51
  # endif
52
- # if ICE_INT_VERSION % 100 < 0
52
+ # if ICE_INT_VERSION % 100 < 1
53
53
  # error Ice patch level mismatch!
54
54
  # endif
55
55
  #endif
@@ -69,40 +69,124 @@ class LookupPrx;
69
69
  namespace IceLocatorDiscovery
70
70
  {
71
71
 
72
+ /**
73
+ * The Ice lookup reply interface must be implemented by clients which
74
+ * are searching for Ice locators. Ice locator implementations invoke
75
+ * on this interface to provide their locator proxy.
76
+ * @see Lookup
77
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
78
+ */
72
79
  class LookupReply : public virtual ::Ice::Object
73
80
  {
74
81
  public:
75
82
 
76
83
  using ProxyType = LookupReplyPrx;
77
84
 
78
- virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
79
- virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
80
- virtual ::std::string ice_id(const ::Ice::Current&) const override;
81
-
85
+ /**
86
+ * Determines whether this object supports an interface with the given Slice type ID.
87
+ * @param id The fully-scoped Slice type ID.
88
+ * @param current The Current object for the invocation.
89
+ * @return True if this object supports the interface, false, otherwise.
90
+ */
91
+ virtual bool ice_isA(::std::string id, const ::Ice::Current& current) const override;
92
+
93
+ /**
94
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
95
+ * @param current The Current object for the invocation.
96
+ * @return A list of fully-scoped type IDs.
97
+ */
98
+ virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override;
99
+
100
+ /**
101
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
102
+ * @param current The Current object for the invocation.
103
+ * @return A fully-scoped type ID.
104
+ */
105
+ virtual ::std::string ice_id(const ::Ice::Current& current) const override;
106
+
107
+ /**
108
+ * Obtains the Slice type ID corresponding to this class.
109
+ * @return A fully-scoped type ID.
110
+ */
82
111
  static const ::std::string& ice_staticId();
83
112
 
84
- virtual void foundLocator(::std::shared_ptr<::Ice::LocatorPrx>, const ::Ice::Current&) = 0;
113
+ /**
114
+ * This method is called by the implementation of the Lookup
115
+ * interface to reply to a findLocator request.
116
+ * @param prx The proxy of the locator.
117
+ * @param current The Current object for the invocation.
118
+ */
119
+ virtual void foundLocator(::std::shared_ptr<::Ice::LocatorPrx> prx, const ::Ice::Current& current) = 0;
120
+ /// \cond INTERNAL
85
121
  bool _iceD_foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
122
+ /// \endcond
86
123
 
124
+ /// \cond INTERNAL
87
125
  virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
126
+ /// \endcond
88
127
  };
89
128
 
129
+ /**
130
+ * The Ice lookup interface is implemented by Ice locator
131
+ * implementations and can be used by clients to find available Ice
132
+ * locators on the network.
133
+ *
134
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup'
135
+ * object accessible through UDP multicast. Clients typically make a
136
+ * multicast findLocator request to find the locator proxy.
137
+ * @see LookupReply
138
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
139
+ */
90
140
  class Lookup : public virtual ::Ice::Object
91
141
  {
92
142
  public:
93
143
 
94
144
  using ProxyType = LookupPrx;
95
145
 
96
- virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
97
- virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
98
- virtual ::std::string ice_id(const ::Ice::Current&) const override;
99
-
146
+ /**
147
+ * Determines whether this object supports an interface with the given Slice type ID.
148
+ * @param id The fully-scoped Slice type ID.
149
+ * @param current The Current object for the invocation.
150
+ * @return True if this object supports the interface, false, otherwise.
151
+ */
152
+ virtual bool ice_isA(::std::string id, const ::Ice::Current& current) const override;
153
+
154
+ /**
155
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
156
+ * @param current The Current object for the invocation.
157
+ * @return A list of fully-scoped type IDs.
158
+ */
159
+ virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override;
160
+
161
+ /**
162
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
163
+ * @param current The Current object for the invocation.
164
+ * @return A fully-scoped type ID.
165
+ */
166
+ virtual ::std::string ice_id(const ::Ice::Current& current) const override;
167
+
168
+ /**
169
+ * Obtains the Slice type ID corresponding to this class.
170
+ * @return A fully-scoped type ID.
171
+ */
100
172
  static const ::std::string& ice_staticId();
101
173
 
102
- virtual void findLocator(::std::string, ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>, const ::Ice::Current&) = 0;
174
+ /**
175
+ * Find a locator proxy with the given instance name.
176
+ * @param instanceName Restrict the search to Ice registries
177
+ * configured with the given instance name. If empty, all the
178
+ * available registries will reply.
179
+ * @param reply The reply object to use to send the reply.
180
+ * @param current The Current object for the invocation.
181
+ */
182
+ virtual void findLocator(::std::string instanceName, ::std::shared_ptr<LookupReplyPrx> reply, const ::Ice::Current& current) = 0;
183
+ /// \cond INTERNAL
103
184
  bool _iceD_findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
185
+ /// \endcond
104
186
 
187
+ /// \cond INTERNAL
105
188
  virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
189
+ /// \endcond
106
190
  };
107
191
 
108
192
  }
@@ -110,89 +194,178 @@ public:
110
194
  namespace IceLocatorDiscovery
111
195
  {
112
196
 
197
+ /**
198
+ * The Ice lookup reply interface must be implemented by clients which
199
+ * are searching for Ice locators. Ice locator implementations invoke
200
+ * on this interface to provide their locator proxy.
201
+ * @see Lookup
202
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
203
+ */
113
204
  class LookupReplyPrx : public virtual ::Ice::Proxy<LookupReplyPrx, ::Ice::ObjectPrx>
114
205
  {
115
206
  public:
116
207
 
117
- void foundLocator(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
208
+ /**
209
+ * This method is called by the implementation of the Lookup
210
+ * interface to reply to a findLocator request.
211
+ * @param prx The proxy of the locator.
212
+ * @param context The Context map to send with the invocation.
213
+ */
214
+ void foundLocator(const ::std::shared_ptr<::Ice::LocatorPrx>& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
118
215
  {
119
- _makePromiseOutgoing<void>(true, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context).get();
216
+ _makePromiseOutgoing<void>(true, this, &LookupReplyPrx::_iceI_foundLocator, prx, context).get();
120
217
  }
121
218
 
219
+ /**
220
+ * This method is called by the implementation of the Lookup
221
+ * interface to reply to a findLocator request.
222
+ * @param prx The proxy of the locator.
223
+ * @param context The Context map to send with the invocation.
224
+ * @return The future object for the invocation.
225
+ */
122
226
  template<template<typename> class P = ::std::promise>
123
- auto foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
227
+ auto foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
124
228
  -> decltype(::std::declval<P<void>>().get_future())
125
229
  {
126
- return _makePromiseOutgoing<void, P>(false, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context);
230
+ return _makePromiseOutgoing<void, P>(false, this, &LookupReplyPrx::_iceI_foundLocator, prx, context);
127
231
  }
128
232
 
233
+ /**
234
+ * This method is called by the implementation of the Lookup
235
+ * interface to reply to a findLocator request.
236
+ * @param prx The proxy of the locator.
237
+ * @param response The response callback.
238
+ * @param ex The exception callback.
239
+ * @param sent The sent callback.
240
+ * @param context The Context map to send with the invocation.
241
+ * @return A function that can be called to cancel the invocation locally.
242
+ */
129
243
  ::std::function<void()>
130
- foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx,
244
+ foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& prx,
131
245
  ::std::function<void()> response,
132
246
  ::std::function<void(::std::exception_ptr)> ex = nullptr,
133
247
  ::std::function<void(bool)> sent = nullptr,
134
- const ::Ice::Context& context = Ice::noExplicitContext)
248
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
135
249
  {
136
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context);
250
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &LookupReplyPrx::_iceI_foundLocator, prx, context);
137
251
  }
138
252
 
253
+ /// \cond INTERNAL
139
254
  void _iceI_foundLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::shared_ptr<::Ice::LocatorPrx>&, const ::Ice::Context&);
255
+ /// \endcond
140
256
 
257
+ /**
258
+ * Obtains the Slice type ID of this interface.
259
+ * @return The fully-scoped type ID.
260
+ */
141
261
  static const ::std::string& ice_staticId();
142
262
 
143
263
  protected:
144
264
 
265
+ /// \cond INTERNAL
145
266
  LookupReplyPrx() = default;
146
267
  friend ::std::shared_ptr<LookupReplyPrx> IceInternal::createProxy<LookupReplyPrx>();
147
268
 
148
269
  virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
270
+ /// \endcond
149
271
  };
150
272
 
273
+ /**
274
+ * The Ice lookup interface is implemented by Ice locator
275
+ * implementations and can be used by clients to find available Ice
276
+ * locators on the network.
277
+ *
278
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup'
279
+ * object accessible through UDP multicast. Clients typically make a
280
+ * multicast findLocator request to find the locator proxy.
281
+ * @see LookupReply
282
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
283
+ */
151
284
  class LookupPrx : public virtual ::Ice::Proxy<LookupPrx, ::Ice::ObjectPrx>
152
285
  {
153
286
  public:
154
287
 
155
- void findLocator(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context = Ice::noExplicitContext)
288
+ /**
289
+ * Find a locator proxy with the given instance name.
290
+ * @param instanceName Restrict the search to Ice registries
291
+ * configured with the given instance name. If empty, all the
292
+ * available registries will reply.
293
+ * @param reply The reply object to use to send the reply.
294
+ * @param context The Context map to send with the invocation.
295
+ */
296
+ void findLocator(const ::std::string& instanceName, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
156
297
  {
157
- _makePromiseOutgoing<void>(true, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context).get();
298
+ _makePromiseOutgoing<void>(true, this, &LookupPrx::_iceI_findLocator, instanceName, reply, context).get();
158
299
  }
159
300
 
301
+ /**
302
+ * Find a locator proxy with the given instance name.
303
+ * @param instanceName Restrict the search to Ice registries
304
+ * configured with the given instance name. If empty, all the
305
+ * available registries will reply.
306
+ * @param reply The reply object to use to send the reply.
307
+ * @param context The Context map to send with the invocation.
308
+ * @return The future object for the invocation.
309
+ */
160
310
  template<template<typename> class P = ::std::promise>
161
- auto findLocatorAsync(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context = Ice::noExplicitContext)
311
+ auto findLocatorAsync(const ::std::string& instanceName, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
162
312
  -> decltype(::std::declval<P<void>>().get_future())
163
313
  {
164
- return _makePromiseOutgoing<void, P>(false, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context);
314
+ return _makePromiseOutgoing<void, P>(false, this, &LookupPrx::_iceI_findLocator, instanceName, reply, context);
165
315
  }
166
316
 
317
+ /**
318
+ * Find a locator proxy with the given instance name.
319
+ * @param instanceName Restrict the search to Ice registries
320
+ * configured with the given instance name. If empty, all the
321
+ * available registries will reply.
322
+ * @param reply The reply object to use to send the reply.
323
+ * @param response The response callback.
324
+ * @param ex The exception callback.
325
+ * @param sent The sent callback.
326
+ * @param context The Context map to send with the invocation.
327
+ * @return A function that can be called to cancel the invocation locally.
328
+ */
167
329
  ::std::function<void()>
168
- findLocatorAsync(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply,
330
+ findLocatorAsync(const ::std::string& instanceName, const ::std::shared_ptr<LookupReplyPrx>& reply,
169
331
  ::std::function<void()> response,
170
332
  ::std::function<void(::std::exception_ptr)> ex = nullptr,
171
333
  ::std::function<void(bool)> sent = nullptr,
172
- const ::Ice::Context& context = Ice::noExplicitContext)
334
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
173
335
  {
174
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context);
336
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &LookupPrx::_iceI_findLocator, instanceName, reply, context);
175
337
  }
176
338
 
177
- void _iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>&, const ::Ice::Context&);
339
+ /// \cond INTERNAL
340
+ void _iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const ::std::shared_ptr<LookupReplyPrx>&, const ::Ice::Context&);
341
+ /// \endcond
178
342
 
343
+ /**
344
+ * Obtains the Slice type ID of this interface.
345
+ * @return The fully-scoped type ID.
346
+ */
179
347
  static const ::std::string& ice_staticId();
180
348
 
181
349
  protected:
182
350
 
351
+ /// \cond INTERNAL
183
352
  LookupPrx() = default;
184
353
  friend ::std::shared_ptr<LookupPrx> IceInternal::createProxy<LookupPrx>();
185
354
 
186
355
  virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
356
+ /// \endcond
187
357
  };
188
358
 
189
359
  }
190
360
 
361
+ /// \cond STREAM
191
362
  namespace Ice
192
363
  {
193
364
 
194
365
  }
366
+ /// \endcond
195
367
 
368
+ /// \cond INTERNAL
196
369
  namespace IceLocatorDiscovery
197
370
  {
198
371
 
@@ -203,6 +376,7 @@ using LookupPtr = ::std::shared_ptr<Lookup>;
203
376
  using LookupPrxPtr = ::std::shared_ptr<LookupPrx>;
204
377
 
205
378
  }
379
+ /// \endcond
206
380
 
207
381
  #else // C++98 mapping
208
382
 
@@ -213,12 +387,16 @@ namespace IceLocatorDiscovery
213
387
  {
214
388
 
215
389
  class LookupReply;
390
+ /// \cond INTERNAL
216
391
  void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>&);
217
392
  ::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::LookupReply*);
393
+ /// \endcond
218
394
 
219
395
  class Lookup;
396
+ /// \cond INTERNAL
220
397
  void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>&);
221
398
  ::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::Lookup*);
399
+ /// \endcond
222
400
 
223
401
  }
224
402
 
@@ -228,32 +406,52 @@ namespace IceLocatorDiscovery
228
406
  {
229
407
 
230
408
  class LookupReply;
231
- ::Ice::Object* upCast(::IceLocatorDiscovery::LookupReply*);
232
- typedef ::IceInternal::Handle< ::IceLocatorDiscovery::LookupReply> LookupReplyPtr;
409
+ /// \cond INTERNAL
410
+ ::Ice::Object* upCast(LookupReply*);
411
+ /// \endcond
412
+ typedef ::IceInternal::Handle< LookupReply> LookupReplyPtr;
233
413
  typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply> LookupReplyPrx;
234
414
  typedef LookupReplyPrx LookupReplyPrxPtr;
415
+ /// \cond INTERNAL
235
416
  void _icePatchObjectPtr(LookupReplyPtr&, const ::Ice::ObjectPtr&);
417
+ /// \endcond
236
418
 
237
419
  class Lookup;
238
- ::Ice::Object* upCast(::IceLocatorDiscovery::Lookup*);
239
- typedef ::IceInternal::Handle< ::IceLocatorDiscovery::Lookup> LookupPtr;
420
+ /// \cond INTERNAL
421
+ ::Ice::Object* upCast(Lookup*);
422
+ /// \endcond
423
+ typedef ::IceInternal::Handle< Lookup> LookupPtr;
240
424
  typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup> LookupPrx;
241
425
  typedef LookupPrx LookupPrxPtr;
426
+ /// \cond INTERNAL
242
427
  void _icePatchObjectPtr(LookupPtr&, const ::Ice::ObjectPtr&);
428
+ /// \endcond
243
429
 
244
430
  }
245
431
 
432
+ /// \cond INTERNAL
246
433
  namespace IceAsync
247
434
  {
248
435
 
249
436
  }
437
+ /// \endcond
250
438
 
251
439
  namespace IceLocatorDiscovery
252
440
  {
253
441
 
442
+ /**
443
+ * Base class for asynchronous callback wrapper classes used for calls to
444
+ * IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
445
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_LookupReply_foundLocator.
446
+ */
254
447
  class Callback_LookupReply_foundLocator_Base : public virtual ::IceInternal::CallbackBase { };
255
448
  typedef ::IceUtil::Handle< Callback_LookupReply_foundLocator_Base> Callback_LookupReply_foundLocatorPtr;
256
449
 
450
+ /**
451
+ * Base class for asynchronous callback wrapper classes used for calls to
452
+ * IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
453
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_Lookup_findLocator.
454
+ */
257
455
  class Callback_Lookup_findLocator_Base : public virtual ::IceInternal::CallbackBase { };
258
456
  typedef ::IceUtil::Handle< Callback_Lookup_findLocator_Base> Callback_Lookup_findLocatorPtr;
259
457
 
@@ -269,37 +467,88 @@ class LookupReply : public virtual ::Ice::Proxy<LookupReply, ::IceProxy::Ice::Ob
269
467
  {
270
468
  public:
271
469
 
272
- void foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
470
+ /**
471
+ * This method is called by the implementation of the Lookup
472
+ * interface to reply to a findLocator request.
473
+ * @param prx The proxy of the locator.
474
+ * @param context The Context map to send with the invocation.
475
+ */
476
+ void foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
273
477
  {
274
- end_foundLocator(_iceI_begin_foundLocator(iceP_prx, context, ::IceInternal::dummyCallback, 0, true));
478
+ end_foundLocator(_iceI_begin_foundLocator(prx, context, ::IceInternal::dummyCallback, 0, true));
275
479
  }
276
480
 
277
- ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
481
+ /**
482
+ * This method is called by the implementation of the Lookup
483
+ * interface to reply to a findLocator request.
484
+ * @param prx The proxy of the locator.
485
+ * @param context The Context map to send with the invocation.
486
+ * @return The asynchronous result object for the invocation.
487
+ */
488
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
278
489
  {
279
- return _iceI_begin_foundLocator(iceP_prx, context, ::IceInternal::dummyCallback, 0);
490
+ return _iceI_begin_foundLocator(prx, context, ::IceInternal::dummyCallback, 0);
280
491
  }
281
492
 
282
- ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
493
+ /**
494
+ * This method is called by the implementation of the Lookup
495
+ * interface to reply to a findLocator request.
496
+ * @param prx The proxy of the locator.
497
+ * @param cb Asynchronous callback object.
498
+ * @param cookie User-defined data to associate with the invocation.
499
+ * @return The asynchronous result object for the invocation.
500
+ */
501
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
283
502
  {
284
- return _iceI_begin_foundLocator(iceP_prx, ::Ice::noExplicitContext, del, cookie);
503
+ return _iceI_begin_foundLocator(prx, ::Ice::noExplicitContext, cb, cookie);
285
504
  }
286
505
 
287
- ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
506
+ /**
507
+ * This method is called by the implementation of the Lookup
508
+ * interface to reply to a findLocator request.
509
+ * @param prx The proxy of the locator.
510
+ * @param context The Context map to send with the invocation.
511
+ * @param cb Asynchronous callback object.
512
+ * @param cookie User-defined data to associate with the invocation.
513
+ * @return The asynchronous result object for the invocation.
514
+ */
515
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
288
516
  {
289
- return _iceI_begin_foundLocator(iceP_prx, context, del, cookie);
517
+ return _iceI_begin_foundLocator(prx, context, cb, cookie);
290
518
  }
291
519
 
292
- ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
520
+ /**
521
+ * This method is called by the implementation of the Lookup
522
+ * interface to reply to a findLocator request.
523
+ * @param prx The proxy of the locator.
524
+ * @param cb Asynchronous callback object.
525
+ * @param cookie User-defined data to associate with the invocation.
526
+ * @return The asynchronous result object for the invocation.
527
+ */
528
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
293
529
  {
294
- return _iceI_begin_foundLocator(iceP_prx, ::Ice::noExplicitContext, del, cookie);
530
+ return _iceI_begin_foundLocator(prx, ::Ice::noExplicitContext, cb, cookie);
295
531
  }
296
532
 
297
- ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
533
+ /**
534
+ * This method is called by the implementation of the Lookup
535
+ * interface to reply to a findLocator request.
536
+ * @param prx The proxy of the locator.
537
+ * @param context The Context map to send with the invocation.
538
+ * @param cb Asynchronous callback object.
539
+ * @param cookie User-defined data to associate with the invocation.
540
+ * @return The asynchronous result object for the invocation.
541
+ */
542
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
298
543
  {
299
- return _iceI_begin_foundLocator(iceP_prx, context, del, cookie);
544
+ return _iceI_begin_foundLocator(prx, context, cb, cookie);
300
545
  }
301
546
 
302
- void end_foundLocator(const ::Ice::AsyncResultPtr&);
547
+ /**
548
+ * Completes an invocation of begin_foundLocator.
549
+ * @param result The asynchronous result object for the invocation.
550
+ */
551
+ void end_foundLocator(const ::Ice::AsyncResultPtr& result);
303
552
 
304
553
  private:
305
554
 
@@ -307,48 +556,117 @@ private:
307
556
 
308
557
  public:
309
558
 
559
+ /**
560
+ * Obtains the Slice type ID corresponding to this interface.
561
+ * @return A fully-scoped type ID.
562
+ */
310
563
  static const ::std::string& ice_staticId();
311
564
 
312
565
  protected:
566
+ /// \cond INTERNAL
313
567
 
314
568
  virtual ::IceProxy::Ice::Object* _newInstance() const;
569
+ /// \endcond
315
570
  };
316
571
 
317
572
  class Lookup : public virtual ::Ice::Proxy<Lookup, ::IceProxy::Ice::Object>
318
573
  {
319
574
  public:
320
575
 
321
- void findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
576
+ /**
577
+ * Find a locator proxy with the given instance name.
578
+ * @param instanceName Restrict the search to Ice registries
579
+ * configured with the given instance name. If empty, all the
580
+ * available registries will reply.
581
+ * @param reply The reply object to use to send the reply.
582
+ * @param context The Context map to send with the invocation.
583
+ */
584
+ void findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
322
585
  {
323
- end_findLocator(_iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, ::IceInternal::dummyCallback, 0, true));
586
+ end_findLocator(_iceI_begin_findLocator(instanceName, reply, context, ::IceInternal::dummyCallback, 0, true));
324
587
  }
325
588
 
326
- ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
589
+ /**
590
+ * Find a locator proxy with the given instance name.
591
+ * @param instanceName Restrict the search to Ice registries
592
+ * configured with the given instance name. If empty, all the
593
+ * available registries will reply.
594
+ * @param reply The reply object to use to send the reply.
595
+ * @param context The Context map to send with the invocation.
596
+ * @return The asynchronous result object for the invocation.
597
+ */
598
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
327
599
  {
328
- return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, ::IceInternal::dummyCallback, 0);
600
+ return _iceI_begin_findLocator(instanceName, reply, context, ::IceInternal::dummyCallback, 0);
329
601
  }
330
602
 
331
- ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
603
+ /**
604
+ * Find a locator proxy with the given instance name.
605
+ * @param instanceName Restrict the search to Ice registries
606
+ * configured with the given instance name. If empty, all the
607
+ * available registries will reply.
608
+ * @param reply The reply object to use to send the reply.
609
+ * @param cb Asynchronous callback object.
610
+ * @param cookie User-defined data to associate with the invocation.
611
+ * @return The asynchronous result object for the invocation.
612
+ */
613
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
332
614
  {
333
- return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, ::Ice::noExplicitContext, del, cookie);
615
+ return _iceI_begin_findLocator(instanceName, reply, ::Ice::noExplicitContext, cb, cookie);
334
616
  }
335
617
 
336
- ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
618
+ /**
619
+ * Find a locator proxy with the given instance name.
620
+ * @param instanceName Restrict the search to Ice registries
621
+ * configured with the given instance name. If empty, all the
622
+ * available registries will reply.
623
+ * @param reply The reply object to use to send the reply.
624
+ * @param context The Context map to send with the invocation.
625
+ * @param cb Asynchronous callback object.
626
+ * @param cookie User-defined data to associate with the invocation.
627
+ * @return The asynchronous result object for the invocation.
628
+ */
629
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
337
630
  {
338
- return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, del, cookie);
631
+ return _iceI_begin_findLocator(instanceName, reply, context, cb, cookie);
339
632
  }
340
633
 
341
- ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
634
+ /**
635
+ * Find a locator proxy with the given instance name.
636
+ * @param instanceName Restrict the search to Ice registries
637
+ * configured with the given instance name. If empty, all the
638
+ * available registries will reply.
639
+ * @param reply The reply object to use to send the reply.
640
+ * @param cb Asynchronous callback object.
641
+ * @param cookie User-defined data to associate with the invocation.
642
+ * @return The asynchronous result object for the invocation.
643
+ */
644
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
342
645
  {
343
- return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, ::Ice::noExplicitContext, del, cookie);
646
+ return _iceI_begin_findLocator(instanceName, reply, ::Ice::noExplicitContext, cb, cookie);
344
647
  }
345
648
 
346
- ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
649
+ /**
650
+ * Find a locator proxy with the given instance name.
651
+ * @param instanceName Restrict the search to Ice registries
652
+ * configured with the given instance name. If empty, all the
653
+ * available registries will reply.
654
+ * @param reply The reply object to use to send the reply.
655
+ * @param context The Context map to send with the invocation.
656
+ * @param cb Asynchronous callback object.
657
+ * @param cookie User-defined data to associate with the invocation.
658
+ * @return The asynchronous result object for the invocation.
659
+ */
660
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
347
661
  {
348
- return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, del, cookie);
662
+ return _iceI_begin_findLocator(instanceName, reply, context, cb, cookie);
349
663
  }
350
664
 
351
- void end_findLocator(const ::Ice::AsyncResultPtr&);
665
+ /**
666
+ * Completes an invocation of begin_findLocator.
667
+ * @param result The asynchronous result object for the invocation.
668
+ */
669
+ void end_findLocator(const ::Ice::AsyncResultPtr& result);
352
670
 
353
671
  private:
354
672
 
@@ -356,11 +674,17 @@ private:
356
674
 
357
675
  public:
358
676
 
677
+ /**
678
+ * Obtains the Slice type ID corresponding to this interface.
679
+ * @return A fully-scoped type ID.
680
+ */
359
681
  static const ::std::string& ice_staticId();
360
682
 
361
683
  protected:
684
+ /// \cond INTERNAL
362
685
 
363
686
  virtual ::IceProxy::Ice::Object* _newInstance() const;
687
+ /// \endcond
364
688
  };
365
689
 
366
690
  }
@@ -370,6 +694,13 @@ protected:
370
694
  namespace IceLocatorDiscovery
371
695
  {
372
696
 
697
+ /**
698
+ * The Ice lookup reply interface must be implemented by clients which
699
+ * are searching for Ice locators. Ice locator implementations invoke
700
+ * on this interface to provide their locator proxy.
701
+ * @see Lookup
702
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
703
+ */
373
704
  class LookupReply : public virtual ::Ice::Object
374
705
  {
375
706
  public:
@@ -379,23 +710,58 @@ public:
379
710
 
380
711
  virtual ~LookupReply();
381
712
 
382
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
383
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
384
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
385
-
713
+ /**
714
+ * Determines whether this object supports an interface with the given Slice type ID.
715
+ * @param id The fully-scoped Slice type ID.
716
+ * @param current The Current object for the invocation.
717
+ * @return True if this object supports the interface, false, otherwise.
718
+ */
719
+ virtual bool ice_isA(const ::std::string& id, const ::Ice::Current& current = ::Ice::emptyCurrent) const;
720
+
721
+ /**
722
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
723
+ * @param current The Current object for the invocation.
724
+ * @return A list of fully-scoped type IDs.
725
+ */
726
+ virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
727
+
728
+ /**
729
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
730
+ * @param current The Current object for the invocation.
731
+ * @return A fully-scoped type ID.
732
+ */
733
+ virtual const ::std::string& ice_id(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
734
+
735
+ /**
736
+ * Obtains the Slice type ID corresponding to this class.
737
+ * @return A fully-scoped type ID.
738
+ */
386
739
  static const ::std::string& ice_staticId();
387
740
 
388
- virtual void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
741
+ /**
742
+ * This method is called by the implementation of the Lookup
743
+ * interface to reply to a findLocator request.
744
+ * @param prx The proxy of the locator.
745
+ * @param current The Current object for the invocation.
746
+ */
747
+ virtual void foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
748
+ /// \cond INTERNAL
389
749
  bool _iceD_foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
750
+ /// \endcond
390
751
 
752
+ /// \cond INTERNAL
391
753
  virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
754
+ /// \endcond
392
755
 
393
756
  protected:
394
757
 
758
+ /// \cond STREAM
395
759
  virtual void _iceWriteImpl(::Ice::OutputStream*) const;
396
760
  virtual void _iceReadImpl(::Ice::InputStream*);
761
+ /// \endcond
397
762
  };
398
763
 
764
+ /// \cond INTERNAL
399
765
  inline bool operator==(const LookupReply& lhs, const LookupReply& rhs)
400
766
  {
401
767
  return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
@@ -405,7 +771,19 @@ inline bool operator<(const LookupReply& lhs, const LookupReply& rhs)
405
771
  {
406
772
  return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
407
773
  }
408
-
774
+ /// \endcond
775
+
776
+ /**
777
+ * The Ice lookup interface is implemented by Ice locator
778
+ * implementations and can be used by clients to find available Ice
779
+ * locators on the network.
780
+ *
781
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup'
782
+ * object accessible through UDP multicast. Clients typically make a
783
+ * multicast findLocator request to find the locator proxy.
784
+ * @see LookupReply
785
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
786
+ */
409
787
  class Lookup : public virtual ::Ice::Object
410
788
  {
411
789
  public:
@@ -415,23 +793,60 @@ public:
415
793
 
416
794
  virtual ~Lookup();
417
795
 
418
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
419
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
420
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
421
-
796
+ /**
797
+ * Determines whether this object supports an interface with the given Slice type ID.
798
+ * @param id The fully-scoped Slice type ID.
799
+ * @param current The Current object for the invocation.
800
+ * @return True if this object supports the interface, false, otherwise.
801
+ */
802
+ virtual bool ice_isA(const ::std::string& id, const ::Ice::Current& current = ::Ice::emptyCurrent) const;
803
+
804
+ /**
805
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
806
+ * @param current The Current object for the invocation.
807
+ * @return A list of fully-scoped type IDs.
808
+ */
809
+ virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
810
+
811
+ /**
812
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
813
+ * @param current The Current object for the invocation.
814
+ * @return A fully-scoped type ID.
815
+ */
816
+ virtual const ::std::string& ice_id(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
817
+
818
+ /**
819
+ * Obtains the Slice type ID corresponding to this class.
820
+ * @return A fully-scoped type ID.
821
+ */
422
822
  static const ::std::string& ice_staticId();
423
823
 
424
- virtual void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
824
+ /**
825
+ * Find a locator proxy with the given instance name.
826
+ * @param instanceName Restrict the search to Ice registries
827
+ * configured with the given instance name. If empty, all the
828
+ * available registries will reply.
829
+ * @param reply The reply object to use to send the reply.
830
+ * @param current The Current object for the invocation.
831
+ */
832
+ virtual void findLocator(const ::std::string& instanceName, const LookupReplyPrx& reply, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
833
+ /// \cond INTERNAL
425
834
  bool _iceD_findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
835
+ /// \endcond
426
836
 
837
+ /// \cond INTERNAL
427
838
  virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
839
+ /// \endcond
428
840
 
429
841
  protected:
430
842
 
843
+ /// \cond STREAM
431
844
  virtual void _iceWriteImpl(::Ice::OutputStream*) const;
432
845
  virtual void _iceReadImpl(::Ice::InputStream*);
846
+ /// \endcond
433
847
  };
434
848
 
849
+ /// \cond INTERNAL
435
850
  inline bool operator==(const Lookup& lhs, const Lookup& rhs)
436
851
  {
437
852
  return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
@@ -441,17 +856,25 @@ inline bool operator<(const Lookup& lhs, const Lookup& rhs)
441
856
  {
442
857
  return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
443
858
  }
859
+ /// \endcond
444
860
 
445
861
  }
446
862
 
863
+ /// \cond STREAM
447
864
  namespace Ice
448
865
  {
449
866
 
450
867
  }
868
+ /// \endcond
451
869
 
452
870
  namespace IceLocatorDiscovery
453
871
  {
454
872
 
873
+ /**
874
+ * Type-safe asynchronous callback wrapper class used for calls to
875
+ * IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
876
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_LookupReply_foundLocator.
877
+ */
455
878
  template<class T>
456
879
  class CallbackNC_LookupReply_foundLocator : public Callback_LookupReply_foundLocator_Base, public ::IceInternal::OnewayCallbackNC<T>
457
880
  {
@@ -469,30 +892,65 @@ public:
469
892
  }
470
893
  };
471
894
 
895
+ /**
896
+ * Creates a callback wrapper instance that delegates to your object.
897
+ * @param instance The callback object.
898
+ * @param cb The success method of the callback object.
899
+ * @param excb The exception method of the callback object.
900
+ * @param sentcb The sent method of the callback object.
901
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
902
+ */
472
903
  template<class T> Callback_LookupReply_foundLocatorPtr
473
904
  newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
474
905
  {
475
906
  return new CallbackNC_LookupReply_foundLocator<T>(instance, cb, excb, sentcb);
476
907
  }
477
908
 
909
+ /**
910
+ * Creates a callback wrapper instance that delegates to your object.
911
+ * @param instance The callback object.
912
+ * @param excb The exception method of the callback object.
913
+ * @param sentcb The sent method of the callback object.
914
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
915
+ */
478
916
  template<class T> Callback_LookupReply_foundLocatorPtr
479
917
  newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
480
918
  {
481
919
  return new CallbackNC_LookupReply_foundLocator<T>(instance, 0, excb, sentcb);
482
920
  }
483
921
 
922
+ /**
923
+ * Creates a callback wrapper instance that delegates to your object.
924
+ * @param instance The callback object.
925
+ * @param cb The success method of the callback object.
926
+ * @param excb The exception method of the callback object.
927
+ * @param sentcb The sent method of the callback object.
928
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
929
+ */
484
930
  template<class T> Callback_LookupReply_foundLocatorPtr
485
931
  newCallback_LookupReply_foundLocator(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
486
932
  {
487
933
  return new CallbackNC_LookupReply_foundLocator<T>(instance, cb, excb, sentcb);
488
934
  }
489
935
 
936
+ /**
937
+ * Creates a callback wrapper instance that delegates to your object.
938
+ * @param instance The callback object.
939
+ * @param excb The exception method of the callback object.
940
+ * @param sentcb The sent method of the callback object.
941
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
942
+ */
490
943
  template<class T> Callback_LookupReply_foundLocatorPtr
491
944
  newCallback_LookupReply_foundLocator(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
492
945
  {
493
946
  return new CallbackNC_LookupReply_foundLocator<T>(instance, 0, excb, sentcb);
494
947
  }
495
948
 
949
+ /**
950
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
951
+ * IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
952
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_LookupReply_foundLocator.
953
+ */
496
954
  template<class T, typename CT>
497
955
  class Callback_LookupReply_foundLocator : public Callback_LookupReply_foundLocator_Base, public ::IceInternal::OnewayCallback<T, CT>
498
956
  {
@@ -510,30 +968,69 @@ public:
510
968
  }
511
969
  };
512
970
 
971
+ /**
972
+ * Creates a callback wrapper instance that delegates to your object.
973
+ * Use this overload when your callback methods receive a cookie value.
974
+ * @param instance The callback object.
975
+ * @param cb The success method of the callback object.
976
+ * @param excb The exception method of the callback object.
977
+ * @param sentcb The sent method of the callback object.
978
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
979
+ */
513
980
  template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
514
981
  newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
515
982
  {
516
983
  return new Callback_LookupReply_foundLocator<T, CT>(instance, cb, excb, sentcb);
517
984
  }
518
985
 
986
+ /**
987
+ * Creates a callback wrapper instance that delegates to your object.
988
+ * Use this overload when your callback methods receive a cookie value.
989
+ * @param instance The callback object.
990
+ * @param excb The exception method of the callback object.
991
+ * @param sentcb The sent method of the callback object.
992
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
993
+ */
519
994
  template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
520
995
  newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
521
996
  {
522
997
  return new Callback_LookupReply_foundLocator<T, CT>(instance, 0, excb, sentcb);
523
998
  }
524
999
 
1000
+ /**
1001
+ * Creates a callback wrapper instance that delegates to your object.
1002
+ * Use this overload when your callback methods receive a cookie value.
1003
+ * @param instance The callback object.
1004
+ * @param cb The success method of the callback object.
1005
+ * @param excb The exception method of the callback object.
1006
+ * @param sentcb The sent method of the callback object.
1007
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
1008
+ */
525
1009
  template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
526
1010
  newCallback_LookupReply_foundLocator(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
527
1011
  {
528
1012
  return new Callback_LookupReply_foundLocator<T, CT>(instance, cb, excb, sentcb);
529
1013
  }
530
1014
 
1015
+ /**
1016
+ * Creates a callback wrapper instance that delegates to your object.
1017
+ * Use this overload when your callback methods receive a cookie value.
1018
+ * @param instance The callback object.
1019
+ * @param excb The exception method of the callback object.
1020
+ * @param sentcb The sent method of the callback object.
1021
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
1022
+ */
531
1023
  template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
532
1024
  newCallback_LookupReply_foundLocator(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
533
1025
  {
534
1026
  return new Callback_LookupReply_foundLocator<T, CT>(instance, 0, excb, sentcb);
535
1027
  }
536
1028
 
1029
+ /**
1030
+ * Type-safe asynchronous callback wrapper class used for calls to
1031
+ * IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1032
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_Lookup_findLocator.
1033
+ */
537
1034
  template<class T>
538
1035
  class CallbackNC_Lookup_findLocator : public Callback_Lookup_findLocator_Base, public ::IceInternal::OnewayCallbackNC<T>
539
1036
  {
@@ -551,30 +1048,65 @@ public:
551
1048
  }
552
1049
  };
553
1050
 
1051
+ /**
1052
+ * Creates a callback wrapper instance that delegates to your object.
1053
+ * @param instance The callback object.
1054
+ * @param cb The success method of the callback object.
1055
+ * @param excb The exception method of the callback object.
1056
+ * @param sentcb The sent method of the callback object.
1057
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1058
+ */
554
1059
  template<class T> Callback_Lookup_findLocatorPtr
555
1060
  newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
556
1061
  {
557
1062
  return new CallbackNC_Lookup_findLocator<T>(instance, cb, excb, sentcb);
558
1063
  }
559
1064
 
1065
+ /**
1066
+ * Creates a callback wrapper instance that delegates to your object.
1067
+ * @param instance The callback object.
1068
+ * @param excb The exception method of the callback object.
1069
+ * @param sentcb The sent method of the callback object.
1070
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1071
+ */
560
1072
  template<class T> Callback_Lookup_findLocatorPtr
561
1073
  newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
562
1074
  {
563
1075
  return new CallbackNC_Lookup_findLocator<T>(instance, 0, excb, sentcb);
564
1076
  }
565
1077
 
1078
+ /**
1079
+ * Creates a callback wrapper instance that delegates to your object.
1080
+ * @param instance The callback object.
1081
+ * @param cb The success method of the callback object.
1082
+ * @param excb The exception method of the callback object.
1083
+ * @param sentcb The sent method of the callback object.
1084
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1085
+ */
566
1086
  template<class T> Callback_Lookup_findLocatorPtr
567
1087
  newCallback_Lookup_findLocator(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
568
1088
  {
569
1089
  return new CallbackNC_Lookup_findLocator<T>(instance, cb, excb, sentcb);
570
1090
  }
571
1091
 
1092
+ /**
1093
+ * Creates a callback wrapper instance that delegates to your object.
1094
+ * @param instance The callback object.
1095
+ * @param excb The exception method of the callback object.
1096
+ * @param sentcb The sent method of the callback object.
1097
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1098
+ */
572
1099
  template<class T> Callback_Lookup_findLocatorPtr
573
1100
  newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
574
1101
  {
575
1102
  return new CallbackNC_Lookup_findLocator<T>(instance, 0, excb, sentcb);
576
1103
  }
577
1104
 
1105
+ /**
1106
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
1107
+ * IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1108
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_Lookup_findLocator.
1109
+ */
578
1110
  template<class T, typename CT>
579
1111
  class Callback_Lookup_findLocator : public Callback_Lookup_findLocator_Base, public ::IceInternal::OnewayCallback<T, CT>
580
1112
  {
@@ -592,24 +1124,58 @@ public:
592
1124
  }
593
1125
  };
594
1126
 
1127
+ /**
1128
+ * Creates a callback wrapper instance that delegates to your object.
1129
+ * Use this overload when your callback methods receive a cookie value.
1130
+ * @param instance The callback object.
1131
+ * @param cb The success method of the callback object.
1132
+ * @param excb The exception method of the callback object.
1133
+ * @param sentcb The sent method of the callback object.
1134
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1135
+ */
595
1136
  template<class T, typename CT> Callback_Lookup_findLocatorPtr
596
1137
  newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
597
1138
  {
598
1139
  return new Callback_Lookup_findLocator<T, CT>(instance, cb, excb, sentcb);
599
1140
  }
600
1141
 
1142
+ /**
1143
+ * Creates a callback wrapper instance that delegates to your object.
1144
+ * Use this overload when your callback methods receive a cookie value.
1145
+ * @param instance The callback object.
1146
+ * @param excb The exception method of the callback object.
1147
+ * @param sentcb The sent method of the callback object.
1148
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1149
+ */
601
1150
  template<class T, typename CT> Callback_Lookup_findLocatorPtr
602
1151
  newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
603
1152
  {
604
1153
  return new Callback_Lookup_findLocator<T, CT>(instance, 0, excb, sentcb);
605
1154
  }
606
1155
 
1156
+ /**
1157
+ * Creates a callback wrapper instance that delegates to your object.
1158
+ * Use this overload when your callback methods receive a cookie value.
1159
+ * @param instance The callback object.
1160
+ * @param cb The success method of the callback object.
1161
+ * @param excb The exception method of the callback object.
1162
+ * @param sentcb The sent method of the callback object.
1163
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1164
+ */
607
1165
  template<class T, typename CT> Callback_Lookup_findLocatorPtr
608
1166
  newCallback_Lookup_findLocator(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
609
1167
  {
610
1168
  return new Callback_Lookup_findLocator<T, CT>(instance, cb, excb, sentcb);
611
1169
  }
612
1170
 
1171
+ /**
1172
+ * Creates a callback wrapper instance that delegates to your object.
1173
+ * Use this overload when your callback methods receive a cookie value.
1174
+ * @param instance The callback object.
1175
+ * @param excb The exception method of the callback object.
1176
+ * @param sentcb The sent method of the callback object.
1177
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
1178
+ */
613
1179
  template<class T, typename CT> Callback_Lookup_findLocatorPtr
614
1180
  newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
615
1181
  {