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,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
  //
@@ -40,7 +40,7 @@
40
40
  # if ICE_INT_VERSION % 100 > 50
41
41
  # error Beta header file detected
42
42
  # endif
43
- # if ICE_INT_VERSION % 100 < 0
43
+ # if ICE_INT_VERSION % 100 < 1
44
44
  # error Ice patch level mismatch!
45
45
  # endif
46
46
  #endif
@@ -66,11 +66,14 @@ class Connection;
66
66
 
67
67
  }
68
68
 
69
+ /// \cond STREAM
69
70
  namespace Ice
70
71
  {
71
72
 
72
73
  }
74
+ /// \endcond
73
75
 
76
+ /// \cond INTERNAL
74
77
  namespace Ice
75
78
  {
76
79
 
@@ -81,6 +84,7 @@ using WSConnectionInfoPtr = ::std::shared_ptr<WSConnectionInfo>;
81
84
  using ConnectionPtr = ::std::shared_ptr<Connection>;
82
85
 
83
86
  }
87
+ /// \endcond
84
88
 
85
89
  #else // C++98 mapping
86
90
 
@@ -88,23 +92,31 @@ namespace Ice
88
92
  {
89
93
 
90
94
  class ConnectionInfo;
91
- ICE_API ::Ice::LocalObject* upCast(::Ice::ConnectionInfo*);
92
- typedef ::IceInternal::Handle< ::Ice::ConnectionInfo> ConnectionInfoPtr;
95
+ /// \cond INTERNAL
96
+ ICE_API LocalObject* upCast(ConnectionInfo*);
97
+ /// \endcond
98
+ typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr;
93
99
 
94
100
  class WSConnectionInfo;
95
- ICE_API ::Ice::LocalObject* upCast(::Ice::WSConnectionInfo*);
96
- typedef ::IceInternal::Handle< ::Ice::WSConnectionInfo> WSConnectionInfoPtr;
101
+ /// \cond INTERNAL
102
+ ICE_API LocalObject* upCast(WSConnectionInfo*);
103
+ /// \endcond
104
+ typedef ::IceInternal::Handle< WSConnectionInfo> WSConnectionInfoPtr;
97
105
 
98
106
  class Connection;
99
- ICE_API ::Ice::LocalObject* upCast(::Ice::Connection*);
100
- typedef ::IceInternal::Handle< ::Ice::Connection> ConnectionPtr;
107
+ /// \cond INTERNAL
108
+ ICE_API LocalObject* upCast(Connection*);
109
+ /// \endcond
110
+ typedef ::IceInternal::Handle< Connection> ConnectionPtr;
101
111
 
102
112
  }
103
113
 
114
+ /// \cond STREAM
104
115
  namespace Ice
105
116
  {
106
117
 
107
118
  }
119
+ /// \endcond
108
120
 
109
121
  #endif
110
122
 
@@ -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
  //
@@ -44,7 +44,7 @@
44
44
  # if ICE_INT_VERSION % 100 > 50
45
45
  # error Beta header file detected
46
46
  # endif
47
- # if ICE_INT_VERSION % 100 < 0
47
+ # if ICE_INT_VERSION % 100 < 1
48
48
  # error Ice patch level mismatch!
49
49
  # endif
50
50
  #endif
@@ -64,28 +64,110 @@
64
64
  namespace Ice
65
65
  {
66
66
 
67
+ /**
68
+ * A request context. <tt>Context</tt> is used to transmit metadata about a
69
+ * request from the server to the client, such as Quality-of-Service
70
+ * (QoS) parameters. Each operation on the client has a <tt>Context</tt> as
71
+ * its implicit final parameter.
72
+ */
67
73
  using Context = ::std::map<::std::string, ::std::string>;
68
74
 
75
+ /**
76
+ * Determines the retry behavior an invocation in case of a (potentially) recoverable error.
77
+ */
69
78
  enum class OperationMode : unsigned char
70
79
  {
80
+ /**
81
+ * Ordinary operations have <tt>Normal</tt> mode. These operations
82
+ * modify object state; invoking such an operation twice in a row
83
+ * has different semantics than invoking it once. The Ice run time
84
+ * guarantees that it will not violate at-most-once semantics for
85
+ * <tt>Normal</tt> operations.
86
+ */
71
87
  Normal,
88
+ /**
89
+ * Operations that use the Slice <tt>nonmutating</tt> keyword must not
90
+ * modify object state. For C++, nonmutating operations generate
91
+ * <tt>const</tt> member functions in the skeleton. In addition, the Ice
92
+ * run time will attempt to transparently recover from certain
93
+ * run-time errors by re-issuing a failed request and propagate
94
+ * the failure to the application only if the second attempt
95
+ * fails.
96
+ *
97
+ * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
98
+ * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
99
+ * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
100
+ * member functions, use the <tt>\["cpp:const"]</tt> metadata
101
+ * directive.
102
+ */
72
103
  Nonmutating,
104
+ /**
105
+ * Operations that use the Slice <tt>idempotent</tt> keyword can modify
106
+ * object state, but invoking an operation twice in a row must
107
+ * result in the same object state as invoking it once. For
108
+ * example, <tt>x = 1</tt> is an idempotent statement,
109
+ * whereas <tt>x += 1</tt> is not. For idempotent
110
+ * operations, the Ice run-time uses the same retry behavior
111
+ * as for nonmutating operations in case of a potentially
112
+ * recoverable error.
113
+ */
73
114
  Idempotent
74
115
  };
75
116
 
117
+ /**
118
+ * Information about the current method invocation for servers. Each
119
+ * operation on the server has a <tt>Current</tt> as its implicit final
120
+ * parameter. <tt>Current</tt> is mostly used for Ice services. Most
121
+ * applications ignore this parameter.
122
+ * \headerfile Ice/Ice.h
123
+ */
76
124
  struct Current
77
125
  {
78
- ::std::shared_ptr<::Ice::ObjectAdapter> adapter;
79
- ::std::shared_ptr<::Ice::Connection> con;
80
- ::Ice::Identity id;
126
+ /**
127
+ * The object adapter.
128
+ */
129
+ ::std::shared_ptr<ObjectAdapter> adapter;
130
+ /**
131
+ * Information about the connection over which the current method
132
+ * invocation was received. If the invocation is direct due to
133
+ * collocation optimization, this value is set to null.
134
+ */
135
+ ::std::shared_ptr<Connection> con;
136
+ /**
137
+ * The Ice object identity.
138
+ */
139
+ Identity id;
140
+ /**
141
+ * The facet.
142
+ */
81
143
  ::std::string facet;
144
+ /**
145
+ * The operation name.
146
+ */
82
147
  ::std::string operation;
83
- ::Ice::OperationMode mode;
84
- ::Ice::Context ctx;
148
+ /**
149
+ * The mode of the operation.
150
+ */
151
+ OperationMode mode;
152
+ /**
153
+ * The request context, as received from the client.
154
+ */
155
+ Context ctx;
156
+ /**
157
+ * The request id unless oneway (0) or collocated (-1).
158
+ */
85
159
  int requestId;
86
- ::Ice::EncodingVersion encoding;
160
+ /**
161
+ * The encoding version used to encode the input and output parameters.
162
+ */
163
+ EncodingVersion encoding;
87
164
 
88
- std::tuple<const ::std::shared_ptr<::Ice::ObjectAdapter>&, const ::std::shared_ptr<::Ice::Connection>&, const ::Ice::Identity&, const ::std::string&, const ::std::string&, const ::Ice::OperationMode&, const ::Ice::Context&, const int&, const ::Ice::EncodingVersion&> ice_tuple() const
165
+ /**
166
+ * Obtains a tuple containing all of the exception's data members.
167
+ * @return The data members in a tuple.
168
+ */
169
+
170
+ std::tuple<const ::std::shared_ptr<ObjectAdapter>&, const ::std::shared_ptr<Connection>&, const Identity&, const ::std::string&, const ::std::string&, const OperationMode&, const Context&, const int&, const EncodingVersion&> ice_tuple() const
89
171
  {
90
172
  return std::tie(adapter, con, id, facet, operation, mode, ctx, requestId, encoding);
91
173
  }
@@ -100,6 +182,7 @@ using Ice::operator!=;
100
182
 
101
183
  }
102
184
 
185
+ /// \cond STREAM
103
186
  namespace Ice
104
187
  {
105
188
 
@@ -114,36 +197,115 @@ struct StreamableTraits< ::Ice::OperationMode>
114
197
  };
115
198
 
116
199
  }
200
+ /// \endcond
117
201
 
118
202
  #else // C++98 mapping
119
203
 
120
204
  namespace Ice
121
205
  {
122
206
 
207
+ /**
208
+ * A request context. <tt>Context</tt> is used to transmit metadata about a
209
+ * request from the server to the client, such as Quality-of-Service
210
+ * (QoS) parameters. Each operation on the client has a <tt>Context</tt> as
211
+ * its implicit final parameter.
212
+ */
123
213
  typedef ::std::map< ::std::string, ::std::string> Context;
124
214
 
215
+ /**
216
+ * Determines the retry behavior an invocation in case of a (potentially) recoverable error.
217
+ */
125
218
  enum OperationMode
126
219
  {
220
+ /**
221
+ * Ordinary operations have <tt>Normal</tt> mode. These operations
222
+ * modify object state; invoking such an operation twice in a row
223
+ * has different semantics than invoking it once. The Ice run time
224
+ * guarantees that it will not violate at-most-once semantics for
225
+ * <tt>Normal</tt> operations.
226
+ */
127
227
  Normal,
228
+ /**
229
+ * Operations that use the Slice <tt>nonmutating</tt> keyword must not
230
+ * modify object state. For C++, nonmutating operations generate
231
+ * <tt>const</tt> member functions in the skeleton. In addition, the Ice
232
+ * run time will attempt to transparently recover from certain
233
+ * run-time errors by re-issuing a failed request and propagate
234
+ * the failure to the application only if the second attempt
235
+ * fails.
236
+ *
237
+ * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
238
+ * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
239
+ * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
240
+ * member functions, use the <tt>\["cpp:const"]</tt> metadata
241
+ * directive.
242
+ */
128
243
  Nonmutating,
244
+ /**
245
+ * Operations that use the Slice <tt>idempotent</tt> keyword can modify
246
+ * object state, but invoking an operation twice in a row must
247
+ * result in the same object state as invoking it once. For
248
+ * example, <tt>x = 1</tt> is an idempotent statement,
249
+ * whereas <tt>x += 1</tt> is not. For idempotent
250
+ * operations, the Ice run-time uses the same retry behavior
251
+ * as for nonmutating operations in case of a potentially
252
+ * recoverable error.
253
+ */
129
254
  Idempotent
130
255
  };
131
256
 
257
+ /**
258
+ * Information about the current method invocation for servers. Each
259
+ * operation on the server has a <tt>Current</tt> as its implicit final
260
+ * parameter. <tt>Current</tt> is mostly used for Ice services. Most
261
+ * applications ignore this parameter.
262
+ * \headerfile Ice/Ice.h
263
+ */
132
264
  struct Current
133
265
  {
134
- ::Ice::ObjectAdapterPtr adapter;
135
- ::Ice::ConnectionPtr con;
136
- ::Ice::Identity id;
266
+ /**
267
+ * The object adapter.
268
+ */
269
+ ObjectAdapterPtr adapter;
270
+ /**
271
+ * Information about the connection over which the current method
272
+ * invocation was received. If the invocation is direct due to
273
+ * collocation optimization, this value is set to null.
274
+ */
275
+ ConnectionPtr con;
276
+ /**
277
+ * The Ice object identity.
278
+ */
279
+ Identity id;
280
+ /**
281
+ * The facet.
282
+ */
137
283
  ::std::string facet;
284
+ /**
285
+ * The operation name.
286
+ */
138
287
  ::std::string operation;
139
- ::Ice::OperationMode mode;
140
- ::Ice::Context ctx;
141
- ::Ice::Int requestId;
142
- ::Ice::EncodingVersion encoding;
288
+ /**
289
+ * The mode of the operation.
290
+ */
291
+ OperationMode mode;
292
+ /**
293
+ * The request context, as received from the client.
294
+ */
295
+ Context ctx;
296
+ /**
297
+ * The request id unless oneway (0) or collocated (-1).
298
+ */
299
+ Int requestId;
300
+ /**
301
+ * The encoding version used to encode the input and output parameters.
302
+ */
303
+ EncodingVersion encoding;
143
304
  };
144
305
 
145
306
  }
146
307
 
308
+ /// \cond STREAM
147
309
  namespace Ice
148
310
  {
149
311
 
@@ -158,6 +320,7 @@ struct StreamableTraits< ::Ice::OperationMode>
158
320
  };
159
321
 
160
322
  }
323
+ /// \endcond
161
324
 
162
325
  #endif
163
326
 
@@ -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
@@ -76,22 +76,49 @@ class OpaqueEndpointInfo;
76
76
  namespace Ice
77
77
  {
78
78
 
79
+ /**
80
+ * Uniquely identifies TCP endpoints.
81
+ */
79
82
  constexpr short TCPEndpointType = 1;
80
83
 
84
+ /**
85
+ * Uniquely identifies SSL endpoints.
86
+ */
81
87
  constexpr short SSLEndpointType = 2;
82
88
 
89
+ /**
90
+ * Uniquely identifies UDP endpoints.
91
+ */
83
92
  constexpr short UDPEndpointType = 3;
84
93
 
94
+ /**
95
+ * Uniquely identifies TCP-based WebSocket endpoints.
96
+ */
85
97
  constexpr short WSEndpointType = 4;
86
98
 
99
+ /**
100
+ * Uniquely identifies SSL-based WebSocket endpoints.
101
+ */
87
102
  constexpr short WSSEndpointType = 5;
88
103
 
104
+ /**
105
+ * Uniquely identifies Bluetooth endpoints.
106
+ */
89
107
  constexpr short BTEndpointType = 6;
90
108
 
109
+ /**
110
+ * Uniquely identifies SSL Bluetooth endpoints.
111
+ */
91
112
  constexpr short BTSEndpointType = 7;
92
113
 
114
+ /**
115
+ * Uniquely identifies iAP-based endpoints.
116
+ */
93
117
  constexpr short iAPEndpointType = 8;
94
118
 
119
+ /**
120
+ * Uniquely identifies SSL iAP-based endpoints.
121
+ */
95
122
  constexpr short iAPSEndpointType = 9;
96
123
 
97
124
  }
@@ -99,6 +126,10 @@ constexpr short iAPSEndpointType = 9;
99
126
  namespace Ice
100
127
  {
101
128
 
129
+ /**
130
+ * Base class providing access to the endpoint details.
131
+ * \headerfile Ice/Ice.h
132
+ */
102
133
  class ICE_CLASS(ICE_API) EndpointInfo
103
134
  {
104
135
  public:
@@ -112,24 +143,58 @@ public:
112
143
  EndpointInfo& operator=(const EndpointInfo&) = default;
113
144
  EndpointInfo& operator=(EndpointInfo&&) = default;
114
145
 
115
- EndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& iceP_underlying, int iceP_timeout, bool iceP_compress) :
116
- underlying(::std::move(iceP_underlying)),
117
- timeout(iceP_timeout),
118
- compress(iceP_compress)
146
+ /**
147
+ * One-shot constructor to initialize all data members.
148
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
149
+ * @param timeout The timeout for the endpoint in milliseconds.
150
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
151
+ */
152
+ EndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress) :
153
+ underlying(::std::move(underlying)),
154
+ timeout(timeout),
155
+ compress(compress)
119
156
  {
120
157
  }
121
158
 
122
- virtual short type() const = 0;
123
-
124
- virtual bool datagram() const = 0;
125
-
126
- virtual bool secure() const = 0;
127
-
128
- ::std::shared_ptr<::Ice::EndpointInfo> underlying;
159
+ /**
160
+ * Returns the type of the endpoint.
161
+ * @return The endpoint type.
162
+ */
163
+ virtual short type() const noexcept = 0;
164
+
165
+ /**
166
+ * Returns true if this endpoint is a datagram endpoint.
167
+ * @return True for a datagram endpoint.
168
+ */
169
+ virtual bool datagram() const noexcept = 0;
170
+
171
+ /**
172
+ * Returns true if this endpoint is a secure endpoint.
173
+ * @return True for a secure endpoint.
174
+ */
175
+ virtual bool secure() const noexcept = 0;
176
+
177
+ /**
178
+ * The information of the underyling endpoint of null if there's
179
+ * no underlying endpoint.
180
+ */
181
+ ::std::shared_ptr<EndpointInfo> underlying;
182
+ /**
183
+ * The timeout for the endpoint in milliseconds. 0 means
184
+ * non-blocking, -1 means no timeout.
185
+ */
129
186
  int timeout;
187
+ /**
188
+ * Specifies whether or not compression should be used if
189
+ * available when using this endpoint.
190
+ */
130
191
  bool compress;
131
192
  };
132
193
 
194
+ /**
195
+ * The user-level interface to an endpoint.
196
+ * \headerfile Ice/Ice.h
197
+ */
133
198
  class ICE_CLASS(ICE_API) Endpoint
134
199
  {
135
200
  public:
@@ -139,11 +204,24 @@ public:
139
204
  virtual bool operator==(const Endpoint&) const = 0;
140
205
  virtual bool operator<(const Endpoint&) const = 0;
141
206
 
142
- virtual ::std::string toString() const = 0;
143
-
144
- virtual ::std::shared_ptr<::Ice::EndpointInfo> getInfo() const = 0;
207
+ /**
208
+ * Return a string representation of the endpoint.
209
+ * @return The string representation of the endpoint.
210
+ */
211
+ virtual ::std::string toString() const noexcept = 0;
212
+
213
+ /**
214
+ * Returns the endpoint information.
215
+ * @return The endpoint information class.
216
+ */
217
+ virtual ::std::shared_ptr<::Ice::EndpointInfo> getInfo() const noexcept = 0;
145
218
  };
146
219
 
220
+ /**
221
+ * Provides access to the address details of a IP endpoint.
222
+ * @see Endpoint
223
+ * \headerfile Ice/Ice.h
224
+ */
147
225
  class ICE_CLASS(ICE_API) IPEndpointInfo : public ::Ice::EndpointInfo
148
226
  {
149
227
  public:
@@ -157,19 +235,42 @@ public:
157
235
  IPEndpointInfo& operator=(const IPEndpointInfo&) = default;
158
236
  IPEndpointInfo& operator=(IPEndpointInfo&&) = default;
159
237
 
160
- IPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& iceP_underlying, int iceP_timeout, bool iceP_compress, const ::std::string& iceP_host, int iceP_port, const ::std::string& iceP_sourceAddress) :
161
- ::Ice::EndpointInfo(::std::move(iceP_underlying), iceP_timeout, iceP_compress),
162
- host(::std::move(iceP_host)),
163
- port(iceP_port),
164
- sourceAddress(::std::move(iceP_sourceAddress))
238
+ /**
239
+ * One-shot constructor to initialize all data members.
240
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
241
+ * @param timeout The timeout for the endpoint in milliseconds.
242
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
243
+ * @param host The host or address configured with the endpoint.
244
+ * @param port The port number.
245
+ * @param sourceAddress The source IP address.
246
+ */
247
+ IPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
248
+ EndpointInfo(::std::move(underlying), timeout, compress),
249
+ host(::std::move(host)),
250
+ port(port),
251
+ sourceAddress(::std::move(sourceAddress))
165
252
  {
166
253
  }
167
254
 
255
+ /**
256
+ * The host or address configured with the endpoint.
257
+ */
168
258
  ::std::string host;
259
+ /**
260
+ * The port number.
261
+ */
169
262
  int port;
263
+ /**
264
+ * The source IP address.
265
+ */
170
266
  ::std::string sourceAddress;
171
267
  };
172
268
 
269
+ /**
270
+ * Provides access to a TCP endpoint information.
271
+ * @see Endpoint
272
+ * \headerfile Ice/Ice.h
273
+ */
173
274
  class ICE_CLASS(ICE_API) TCPEndpointInfo : public ::Ice::IPEndpointInfo
174
275
  {
175
276
  public:
@@ -183,12 +284,26 @@ public:
183
284
  TCPEndpointInfo& operator=(const TCPEndpointInfo&) = default;
184
285
  TCPEndpointInfo& operator=(TCPEndpointInfo&&) = default;
185
286
 
186
- TCPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& iceP_underlying, int iceP_timeout, bool iceP_compress, const ::std::string& iceP_host, int iceP_port, const ::std::string& iceP_sourceAddress) :
187
- ::Ice::IPEndpointInfo(::std::move(iceP_underlying), iceP_timeout, iceP_compress, ::std::move(iceP_host), iceP_port, ::std::move(iceP_sourceAddress))
287
+ /**
288
+ * One-shot constructor to initialize all data members.
289
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
290
+ * @param timeout The timeout for the endpoint in milliseconds.
291
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
292
+ * @param host The host or address configured with the endpoint.
293
+ * @param port The port number.
294
+ * @param sourceAddress The source IP address.
295
+ */
296
+ TCPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
297
+ IPEndpointInfo(::std::move(underlying), timeout, compress, ::std::move(host), port, ::std::move(sourceAddress))
188
298
  {
189
299
  }
190
300
  };
191
301
 
302
+ /**
303
+ * Provides access to an UDP endpoint information.
304
+ * @see Endpoint
305
+ * \headerfile Ice/Ice.h
306
+ */
192
307
  class ICE_CLASS(ICE_API) UDPEndpointInfo : public ::Ice::IPEndpointInfo
193
308
  {
194
309
  public:
@@ -202,17 +317,38 @@ public:
202
317
  UDPEndpointInfo& operator=(const UDPEndpointInfo&) = default;
203
318
  UDPEndpointInfo& operator=(UDPEndpointInfo&&) = default;
204
319
 
205
- UDPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& iceP_underlying, int iceP_timeout, bool iceP_compress, const ::std::string& iceP_host, int iceP_port, const ::std::string& iceP_sourceAddress, const ::std::string& iceP_mcastInterface, int iceP_mcastTtl) :
206
- ::Ice::IPEndpointInfo(::std::move(iceP_underlying), iceP_timeout, iceP_compress, ::std::move(iceP_host), iceP_port, ::std::move(iceP_sourceAddress)),
207
- mcastInterface(::std::move(iceP_mcastInterface)),
208
- mcastTtl(iceP_mcastTtl)
320
+ /**
321
+ * One-shot constructor to initialize all data members.
322
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
323
+ * @param timeout The timeout for the endpoint in milliseconds.
324
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
325
+ * @param host The host or address configured with the endpoint.
326
+ * @param port The port number.
327
+ * @param sourceAddress The source IP address.
328
+ * @param mcastInterface The multicast interface.
329
+ * @param mcastTtl The multicast time-to-live (or hops).
330
+ */
331
+ UDPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, int mcastTtl) :
332
+ IPEndpointInfo(::std::move(underlying), timeout, compress, ::std::move(host), port, ::std::move(sourceAddress)),
333
+ mcastInterface(::std::move(mcastInterface)),
334
+ mcastTtl(mcastTtl)
209
335
  {
210
336
  }
211
337
 
338
+ /**
339
+ * The multicast interface.
340
+ */
212
341
  ::std::string mcastInterface;
342
+ /**
343
+ * The multicast time-to-live (or hops).
344
+ */
213
345
  int mcastTtl;
214
346
  };
215
347
 
348
+ /**
349
+ * Provides access to a WebSocket endpoint information.
350
+ * \headerfile Ice/Ice.h
351
+ */
216
352
  class ICE_CLASS(ICE_API) WSEndpointInfo : public ::Ice::EndpointInfo
217
353
  {
218
354
  public:
@@ -226,15 +362,30 @@ public:
226
362
  WSEndpointInfo& operator=(const WSEndpointInfo&) = default;
227
363
  WSEndpointInfo& operator=(WSEndpointInfo&&) = default;
228
364
 
229
- WSEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& iceP_underlying, int iceP_timeout, bool iceP_compress, const ::std::string& iceP_resource) :
230
- ::Ice::EndpointInfo(::std::move(iceP_underlying), iceP_timeout, iceP_compress),
231
- resource(::std::move(iceP_resource))
365
+ /**
366
+ * One-shot constructor to initialize all data members.
367
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
368
+ * @param timeout The timeout for the endpoint in milliseconds.
369
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
370
+ * @param resource The URI configured with the endpoint.
371
+ */
372
+ WSEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& resource) :
373
+ EndpointInfo(::std::move(underlying), timeout, compress),
374
+ resource(::std::move(resource))
232
375
  {
233
376
  }
234
377
 
378
+ /**
379
+ * The URI configured with the endpoint.
380
+ */
235
381
  ::std::string resource;
236
382
  };
237
383
 
384
+ /**
385
+ * Provides access to the details of an opaque endpoint.
386
+ * @see Endpoint
387
+ * \headerfile Ice/Ice.h
388
+ */
238
389
  class ICE_CLASS(ICE_API) OpaqueEndpointInfo : public ::Ice::EndpointInfo
239
390
  {
240
391
  public:
@@ -248,24 +399,42 @@ public:
248
399
  OpaqueEndpointInfo& operator=(const OpaqueEndpointInfo&) = default;
249
400
  OpaqueEndpointInfo& operator=(OpaqueEndpointInfo&&) = default;
250
401
 
251
- OpaqueEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& iceP_underlying, int iceP_timeout, bool iceP_compress, const ::Ice::EncodingVersion& iceP_rawEncoding, const ::Ice::ByteSeq& iceP_rawBytes) :
252
- ::Ice::EndpointInfo(::std::move(iceP_underlying), iceP_timeout, iceP_compress),
253
- rawEncoding(::std::move(iceP_rawEncoding)),
254
- rawBytes(::std::move(iceP_rawBytes))
402
+ /**
403
+ * One-shot constructor to initialize all data members.
404
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
405
+ * @param timeout The timeout for the endpoint in milliseconds.
406
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
407
+ * @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
408
+ * @param rawBytes The raw encoding of the opaque endpoint.
409
+ */
410
+ OpaqueEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const EncodingVersion& rawEncoding, const ByteSeq& rawBytes) :
411
+ EndpointInfo(::std::move(underlying), timeout, compress),
412
+ rawEncoding(::std::move(rawEncoding)),
413
+ rawBytes(::std::move(rawBytes))
255
414
  {
256
415
  }
257
416
 
258
- ::Ice::EncodingVersion rawEncoding;
259
- ::Ice::ByteSeq rawBytes;
417
+ /**
418
+ * The encoding version of the opaque endpoint (to decode or
419
+ * encode the rawBytes).
420
+ */
421
+ EncodingVersion rawEncoding;
422
+ /**
423
+ * The raw encoding of the opaque endpoint.
424
+ */
425
+ ByteSeq rawBytes;
260
426
  };
261
427
 
262
428
  }
263
429
 
430
+ /// \cond STREAM
264
431
  namespace Ice
265
432
  {
266
433
 
267
434
  }
435
+ /// \endcond
268
436
 
437
+ /// \cond INTERNAL
269
438
  namespace Ice
270
439
  {
271
440
 
@@ -284,6 +453,7 @@ using WSEndpointInfoPtr = ::std::shared_ptr<WSEndpointInfo>;
284
453
  using OpaqueEndpointInfoPtr = ::std::shared_ptr<OpaqueEndpointInfo>;
285
454
 
286
455
  }
456
+ /// \endcond
287
457
 
288
458
  #else // C++98 mapping
289
459
 
@@ -291,62 +461,107 @@ namespace Ice
291
461
  {
292
462
 
293
463
  class EndpointInfo;
294
- ICE_API ::Ice::LocalObject* upCast(::Ice::EndpointInfo*);
295
- typedef ::IceInternal::Handle< ::Ice::EndpointInfo> EndpointInfoPtr;
464
+ /// \cond INTERNAL
465
+ ICE_API LocalObject* upCast(EndpointInfo*);
466
+ /// \endcond
467
+ typedef ::IceInternal::Handle< EndpointInfo> EndpointInfoPtr;
296
468
 
297
469
  class Endpoint;
298
- ICE_API ::Ice::LocalObject* upCast(::Ice::Endpoint*);
299
- typedef ::IceInternal::Handle< ::Ice::Endpoint> EndpointPtr;
470
+ /// \cond INTERNAL
471
+ ICE_API LocalObject* upCast(Endpoint*);
472
+ /// \endcond
473
+ typedef ::IceInternal::Handle< Endpoint> EndpointPtr;
300
474
 
301
475
  class IPEndpointInfo;
302
- ICE_API ::Ice::LocalObject* upCast(::Ice::IPEndpointInfo*);
303
- typedef ::IceInternal::Handle< ::Ice::IPEndpointInfo> IPEndpointInfoPtr;
476
+ /// \cond INTERNAL
477
+ ICE_API LocalObject* upCast(IPEndpointInfo*);
478
+ /// \endcond
479
+ typedef ::IceInternal::Handle< IPEndpointInfo> IPEndpointInfoPtr;
304
480
 
305
481
  class TCPEndpointInfo;
306
- ICE_API ::Ice::LocalObject* upCast(::Ice::TCPEndpointInfo*);
307
- typedef ::IceInternal::Handle< ::Ice::TCPEndpointInfo> TCPEndpointInfoPtr;
482
+ /// \cond INTERNAL
483
+ ICE_API LocalObject* upCast(TCPEndpointInfo*);
484
+ /// \endcond
485
+ typedef ::IceInternal::Handle< TCPEndpointInfo> TCPEndpointInfoPtr;
308
486
 
309
487
  class UDPEndpointInfo;
310
- ICE_API ::Ice::LocalObject* upCast(::Ice::UDPEndpointInfo*);
311
- typedef ::IceInternal::Handle< ::Ice::UDPEndpointInfo> UDPEndpointInfoPtr;
488
+ /// \cond INTERNAL
489
+ ICE_API LocalObject* upCast(UDPEndpointInfo*);
490
+ /// \endcond
491
+ typedef ::IceInternal::Handle< UDPEndpointInfo> UDPEndpointInfoPtr;
312
492
 
313
493
  class WSEndpointInfo;
314
- ICE_API ::Ice::LocalObject* upCast(::Ice::WSEndpointInfo*);
315
- typedef ::IceInternal::Handle< ::Ice::WSEndpointInfo> WSEndpointInfoPtr;
494
+ /// \cond INTERNAL
495
+ ICE_API LocalObject* upCast(WSEndpointInfo*);
496
+ /// \endcond
497
+ typedef ::IceInternal::Handle< WSEndpointInfo> WSEndpointInfoPtr;
316
498
 
317
499
  class OpaqueEndpointInfo;
318
- ICE_API ::Ice::LocalObject* upCast(::Ice::OpaqueEndpointInfo*);
319
- typedef ::IceInternal::Handle< ::Ice::OpaqueEndpointInfo> OpaqueEndpointInfoPtr;
500
+ /// \cond INTERNAL
501
+ ICE_API LocalObject* upCast(OpaqueEndpointInfo*);
502
+ /// \endcond
503
+ typedef ::IceInternal::Handle< OpaqueEndpointInfo> OpaqueEndpointInfoPtr;
320
504
 
321
505
  }
322
506
 
323
507
  namespace Ice
324
508
  {
325
509
 
326
- const ::Ice::Short TCPEndpointType = 1;
510
+ /**
511
+ * Uniquely identifies TCP endpoints.
512
+ */
513
+ const Short TCPEndpointType = 1;
327
514
 
328
- const ::Ice::Short SSLEndpointType = 2;
515
+ /**
516
+ * Uniquely identifies SSL endpoints.
517
+ */
518
+ const Short SSLEndpointType = 2;
329
519
 
330
- const ::Ice::Short UDPEndpointType = 3;
520
+ /**
521
+ * Uniquely identifies UDP endpoints.
522
+ */
523
+ const Short UDPEndpointType = 3;
331
524
 
332
- const ::Ice::Short WSEndpointType = 4;
525
+ /**
526
+ * Uniquely identifies TCP-based WebSocket endpoints.
527
+ */
528
+ const Short WSEndpointType = 4;
333
529
 
334
- const ::Ice::Short WSSEndpointType = 5;
530
+ /**
531
+ * Uniquely identifies SSL-based WebSocket endpoints.
532
+ */
533
+ const Short WSSEndpointType = 5;
335
534
 
336
- const ::Ice::Short BTEndpointType = 6;
535
+ /**
536
+ * Uniquely identifies Bluetooth endpoints.
537
+ */
538
+ const Short BTEndpointType = 6;
337
539
 
338
- const ::Ice::Short BTSEndpointType = 7;
540
+ /**
541
+ * Uniquely identifies SSL Bluetooth endpoints.
542
+ */
543
+ const Short BTSEndpointType = 7;
339
544
 
340
- const ::Ice::Short iAPEndpointType = 8;
545
+ /**
546
+ * Uniquely identifies iAP-based endpoints.
547
+ */
548
+ const Short iAPEndpointType = 8;
341
549
 
342
- const ::Ice::Short iAPSEndpointType = 9;
550
+ /**
551
+ * Uniquely identifies SSL iAP-based endpoints.
552
+ */
553
+ const Short iAPSEndpointType = 9;
343
554
 
344
555
  }
345
556
 
346
557
  namespace Ice
347
558
  {
348
559
 
349
- class ICE_API EndpointInfo : public virtual ::Ice::LocalObject
560
+ /**
561
+ * Base class providing access to the endpoint details.
562
+ * \headerfile Ice/Ice.h
563
+ */
564
+ class ICE_API EndpointInfo : public virtual LocalObject
350
565
  {
351
566
  public:
352
567
 
@@ -358,35 +573,71 @@ public:
358
573
  {
359
574
  }
360
575
 
361
- EndpointInfo(const ::Ice::EndpointInfoPtr& iceP_underlying, ::Ice::Int iceP_timeout, bool iceP_compress) :
362
- underlying(iceP_underlying),
363
- timeout(iceP_timeout),
364
- compress(iceP_compress)
576
+ /**
577
+ * One-shot constructor to initialize all data members.
578
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
579
+ * @param timeout The timeout for the endpoint in milliseconds.
580
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
581
+ */
582
+ EndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress) :
583
+ underlying(underlying),
584
+ timeout(timeout),
585
+ compress(compress)
365
586
  {
366
587
  }
367
588
 
368
- virtual ::Ice::Short type() const = 0;
369
-
370
- virtual bool datagram() const = 0;
371
-
372
- virtual bool secure() const = 0;
373
-
374
- ::Ice::EndpointInfoPtr underlying;
375
- ::Ice::Int timeout;
589
+ /**
590
+ * Returns the type of the endpoint.
591
+ * @return The endpoint type.
592
+ */
593
+ virtual Short type() const ICE_NOEXCEPT = 0;
594
+
595
+ /**
596
+ * Returns true if this endpoint is a datagram endpoint.
597
+ * @return True for a datagram endpoint.
598
+ */
599
+ virtual bool datagram() const ICE_NOEXCEPT = 0;
600
+
601
+ /**
602
+ * Returns true if this endpoint is a secure endpoint.
603
+ * @return True for a secure endpoint.
604
+ */
605
+ virtual bool secure() const ICE_NOEXCEPT = 0;
606
+
607
+ /**
608
+ * The information of the underyling endpoint of null if there's
609
+ * no underlying endpoint.
610
+ */
611
+ EndpointInfoPtr underlying;
612
+ /**
613
+ * The timeout for the endpoint in milliseconds. 0 means
614
+ * non-blocking, -1 means no timeout.
615
+ */
616
+ Int timeout;
617
+ /**
618
+ * Specifies whether or not compression should be used if
619
+ * available when using this endpoint.
620
+ */
376
621
  bool compress;
377
622
  };
378
623
 
624
+ /// \cond INTERNAL
379
625
  inline bool operator==(const EndpointInfo& lhs, const EndpointInfo& rhs)
380
626
  {
381
- return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
627
+ return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
382
628
  }
383
629
 
384
630
  inline bool operator<(const EndpointInfo& lhs, const EndpointInfo& rhs)
385
631
  {
386
- return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
632
+ return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
387
633
  }
634
+ /// \endcond
388
635
 
389
- class ICE_API Endpoint : public virtual ::Ice::LocalObject
636
+ /**
637
+ * The user-level interface to an endpoint.
638
+ * \headerfile Ice/Ice.h
639
+ */
640
+ class ICE_API Endpoint : public virtual LocalObject
390
641
  {
391
642
  public:
392
643
 
@@ -394,22 +645,37 @@ public:
394
645
 
395
646
  virtual ~Endpoint();
396
647
 
397
- virtual ::std::string toString() const = 0;
398
-
399
- virtual ::Ice::EndpointInfoPtr getInfo() const = 0;
648
+ /**
649
+ * Return a string representation of the endpoint.
650
+ * @return The string representation of the endpoint.
651
+ */
652
+ virtual ::std::string toString() const ICE_NOEXCEPT = 0;
653
+
654
+ /**
655
+ * Returns the endpoint information.
656
+ * @return The endpoint information class.
657
+ */
658
+ virtual EndpointInfoPtr getInfo() const ICE_NOEXCEPT = 0;
400
659
  };
401
660
 
661
+ /// \cond INTERNAL
402
662
  inline bool operator==(const Endpoint& lhs, const Endpoint& rhs)
403
663
  {
404
- return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
664
+ return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
405
665
  }
406
666
 
407
667
  inline bool operator<(const Endpoint& lhs, const Endpoint& rhs)
408
668
  {
409
- return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
669
+ return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
410
670
  }
671
+ /// \endcond
411
672
 
412
- class ICE_API IPEndpointInfo : public ::Ice::EndpointInfo
673
+ /**
674
+ * Provides access to the address details of a IP endpoint.
675
+ * @see Endpoint
676
+ * \headerfile Ice/Ice.h
677
+ */
678
+ class ICE_API IPEndpointInfo : public EndpointInfo
413
679
  {
414
680
  public:
415
681
 
@@ -421,30 +687,55 @@ public:
421
687
  {
422
688
  }
423
689
 
424
- IPEndpointInfo(const ::Ice::EndpointInfoPtr& iceP_underlying, ::Ice::Int iceP_timeout, bool iceP_compress, const ::std::string& iceP_host, ::Ice::Int iceP_port, const ::std::string& iceP_sourceAddress) :
425
- ::Ice::EndpointInfo(iceP_underlying, iceP_timeout, iceP_compress),
426
- host(iceP_host),
427
- port(iceP_port),
428
- sourceAddress(iceP_sourceAddress)
690
+ /**
691
+ * One-shot constructor to initialize all data members.
692
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
693
+ * @param timeout The timeout for the endpoint in milliseconds.
694
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
695
+ * @param host The host or address configured with the endpoint.
696
+ * @param port The port number.
697
+ * @param sourceAddress The source IP address.
698
+ */
699
+ IPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress) :
700
+ ::Ice::EndpointInfo(underlying, timeout, compress),
701
+ host(host),
702
+ port(port),
703
+ sourceAddress(sourceAddress)
429
704
  {
430
705
  }
431
706
 
707
+ /**
708
+ * The host or address configured with the endpoint.
709
+ */
432
710
  ::std::string host;
433
- ::Ice::Int port;
711
+ /**
712
+ * The port number.
713
+ */
714
+ Int port;
715
+ /**
716
+ * The source IP address.
717
+ */
434
718
  ::std::string sourceAddress;
435
719
  };
436
720
 
721
+ /// \cond INTERNAL
437
722
  inline bool operator==(const IPEndpointInfo& lhs, const IPEndpointInfo& rhs)
438
723
  {
439
- return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
724
+ return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
440
725
  }
441
726
 
442
727
  inline bool operator<(const IPEndpointInfo& lhs, const IPEndpointInfo& rhs)
443
728
  {
444
- return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
729
+ return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
445
730
  }
731
+ /// \endcond
446
732
 
447
- class ICE_API TCPEndpointInfo : public ::Ice::IPEndpointInfo
733
+ /**
734
+ * Provides access to a TCP endpoint information.
735
+ * @see Endpoint
736
+ * \headerfile Ice/Ice.h
737
+ */
738
+ class ICE_API TCPEndpointInfo : public IPEndpointInfo
448
739
  {
449
740
  public:
450
741
 
@@ -456,23 +747,39 @@ public:
456
747
  {
457
748
  }
458
749
 
459
- TCPEndpointInfo(const ::Ice::EndpointInfoPtr& iceP_underlying, ::Ice::Int iceP_timeout, bool iceP_compress, const ::std::string& iceP_host, ::Ice::Int iceP_port, const ::std::string& iceP_sourceAddress) :
460
- ::Ice::IPEndpointInfo(iceP_underlying, iceP_timeout, iceP_compress, iceP_host, iceP_port, iceP_sourceAddress)
750
+ /**
751
+ * One-shot constructor to initialize all data members.
752
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
753
+ * @param timeout The timeout for the endpoint in milliseconds.
754
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
755
+ * @param host The host or address configured with the endpoint.
756
+ * @param port The port number.
757
+ * @param sourceAddress The source IP address.
758
+ */
759
+ TCPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress) :
760
+ ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
461
761
  {
462
762
  }
463
763
  };
464
764
 
765
+ /// \cond INTERNAL
465
766
  inline bool operator==(const TCPEndpointInfo& lhs, const TCPEndpointInfo& rhs)
466
767
  {
467
- return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
768
+ return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
468
769
  }
469
770
 
470
771
  inline bool operator<(const TCPEndpointInfo& lhs, const TCPEndpointInfo& rhs)
471
772
  {
472
- return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
773
+ return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
473
774
  }
775
+ /// \endcond
474
776
 
475
- class ICE_API UDPEndpointInfo : public ::Ice::IPEndpointInfo
777
+ /**
778
+ * Provides access to an UDP endpoint information.
779
+ * @see Endpoint
780
+ * \headerfile Ice/Ice.h
781
+ */
782
+ class ICE_API UDPEndpointInfo : public IPEndpointInfo
476
783
  {
477
784
  public:
478
785
 
@@ -484,28 +791,51 @@ public:
484
791
  {
485
792
  }
486
793
 
487
- UDPEndpointInfo(const ::Ice::EndpointInfoPtr& iceP_underlying, ::Ice::Int iceP_timeout, bool iceP_compress, const ::std::string& iceP_host, ::Ice::Int iceP_port, const ::std::string& iceP_sourceAddress, const ::std::string& iceP_mcastInterface, ::Ice::Int iceP_mcastTtl) :
488
- ::Ice::IPEndpointInfo(iceP_underlying, iceP_timeout, iceP_compress, iceP_host, iceP_port, iceP_sourceAddress),
489
- mcastInterface(iceP_mcastInterface),
490
- mcastTtl(iceP_mcastTtl)
794
+ /**
795
+ * One-shot constructor to initialize all data members.
796
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
797
+ * @param timeout The timeout for the endpoint in milliseconds.
798
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
799
+ * @param host The host or address configured with the endpoint.
800
+ * @param port The port number.
801
+ * @param sourceAddress The source IP address.
802
+ * @param mcastInterface The multicast interface.
803
+ * @param mcastTtl The multicast time-to-live (or hops).
804
+ */
805
+ UDPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, Int mcastTtl) :
806
+ ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress),
807
+ mcastInterface(mcastInterface),
808
+ mcastTtl(mcastTtl)
491
809
  {
492
810
  }
493
811
 
812
+ /**
813
+ * The multicast interface.
814
+ */
494
815
  ::std::string mcastInterface;
495
- ::Ice::Int mcastTtl;
816
+ /**
817
+ * The multicast time-to-live (or hops).
818
+ */
819
+ Int mcastTtl;
496
820
  };
497
821
 
822
+ /// \cond INTERNAL
498
823
  inline bool operator==(const UDPEndpointInfo& lhs, const UDPEndpointInfo& rhs)
499
824
  {
500
- return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
825
+ return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
501
826
  }
502
827
 
503
828
  inline bool operator<(const UDPEndpointInfo& lhs, const UDPEndpointInfo& rhs)
504
829
  {
505
- return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
830
+ return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
506
831
  }
832
+ /// \endcond
507
833
 
508
- class ICE_API WSEndpointInfo : public ::Ice::EndpointInfo
834
+ /**
835
+ * Provides access to a WebSocket endpoint information.
836
+ * \headerfile Ice/Ice.h
837
+ */
838
+ class ICE_API WSEndpointInfo : public EndpointInfo
509
839
  {
510
840
  public:
511
841
 
@@ -517,26 +847,43 @@ public:
517
847
  {
518
848
  }
519
849
 
520
- WSEndpointInfo(const ::Ice::EndpointInfoPtr& iceP_underlying, ::Ice::Int iceP_timeout, bool iceP_compress, const ::std::string& iceP_resource) :
521
- ::Ice::EndpointInfo(iceP_underlying, iceP_timeout, iceP_compress),
522
- resource(iceP_resource)
850
+ /**
851
+ * One-shot constructor to initialize all data members.
852
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
853
+ * @param timeout The timeout for the endpoint in milliseconds.
854
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
855
+ * @param resource The URI configured with the endpoint.
856
+ */
857
+ WSEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& resource) :
858
+ ::Ice::EndpointInfo(underlying, timeout, compress),
859
+ resource(resource)
523
860
  {
524
861
  }
525
862
 
863
+ /**
864
+ * The URI configured with the endpoint.
865
+ */
526
866
  ::std::string resource;
527
867
  };
528
868
 
869
+ /// \cond INTERNAL
529
870
  inline bool operator==(const WSEndpointInfo& lhs, const WSEndpointInfo& rhs)
530
871
  {
531
- return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
872
+ return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
532
873
  }
533
874
 
534
875
  inline bool operator<(const WSEndpointInfo& lhs, const WSEndpointInfo& rhs)
535
876
  {
536
- return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
877
+ return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
537
878
  }
879
+ /// \endcond
538
880
 
539
- class ICE_API OpaqueEndpointInfo : public ::Ice::EndpointInfo
881
+ /**
882
+ * Provides access to the details of an opaque endpoint.
883
+ * @see Endpoint
884
+ * \headerfile Ice/Ice.h
885
+ */
886
+ class ICE_API OpaqueEndpointInfo : public EndpointInfo
540
887
  {
541
888
  public:
542
889
 
@@ -548,33 +895,52 @@ public:
548
895
  {
549
896
  }
550
897
 
551
- OpaqueEndpointInfo(const ::Ice::EndpointInfoPtr& iceP_underlying, ::Ice::Int iceP_timeout, bool iceP_compress, const ::Ice::EncodingVersion& iceP_rawEncoding, const ::Ice::ByteSeq& iceP_rawBytes) :
552
- ::Ice::EndpointInfo(iceP_underlying, iceP_timeout, iceP_compress),
553
- rawEncoding(iceP_rawEncoding),
554
- rawBytes(iceP_rawBytes)
898
+ /**
899
+ * One-shot constructor to initialize all data members.
900
+ * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
901
+ * @param timeout The timeout for the endpoint in milliseconds.
902
+ * @param compress Specifies whether or not compression should be used if available when using this endpoint.
903
+ * @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
904
+ * @param rawBytes The raw encoding of the opaque endpoint.
905
+ */
906
+ OpaqueEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const EncodingVersion& rawEncoding, const ByteSeq& rawBytes) :
907
+ ::Ice::EndpointInfo(underlying, timeout, compress),
908
+ rawEncoding(rawEncoding),
909
+ rawBytes(rawBytes)
555
910
  {
556
911
  }
557
912
 
558
- ::Ice::EncodingVersion rawEncoding;
559
- ::Ice::ByteSeq rawBytes;
913
+ /**
914
+ * The encoding version of the opaque endpoint (to decode or
915
+ * encode the rawBytes).
916
+ */
917
+ EncodingVersion rawEncoding;
918
+ /**
919
+ * The raw encoding of the opaque endpoint.
920
+ */
921
+ ByteSeq rawBytes;
560
922
  };
561
923
 
924
+ /// \cond INTERNAL
562
925
  inline bool operator==(const OpaqueEndpointInfo& lhs, const OpaqueEndpointInfo& rhs)
563
926
  {
564
- return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
927
+ return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
565
928
  }
566
929
 
567
930
  inline bool operator<(const OpaqueEndpointInfo& lhs, const OpaqueEndpointInfo& rhs)
568
931
  {
569
- return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
932
+ return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
570
933
  }
934
+ /// \endcond
571
935
 
572
936
  }
573
937
 
938
+ /// \cond STREAM
574
939
  namespace Ice
575
940
  {
576
941
 
577
942
  }
943
+ /// \endcond
578
944
 
579
945
  #endif
580
946