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
  //
@@ -41,7 +41,7 @@
41
41
  # if ICE_INT_VERSION % 100 > 50
42
42
  # error Beta header file detected
43
43
  # endif
44
- # if ICE_INT_VERSION % 100 < 0
44
+ # if ICE_INT_VERSION % 100 < 1
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
@@ -67,11 +67,14 @@ class PropertiesAdminPrx;
67
67
 
68
68
  }
69
69
 
70
+ /// \cond STREAM
70
71
  namespace Ice
71
72
  {
72
73
 
73
74
  }
75
+ /// \endcond
74
76
 
77
+ /// \cond INTERNAL
75
78
  namespace Ice
76
79
  {
77
80
 
@@ -81,6 +84,7 @@ using PropertiesAdminPtr = ::std::shared_ptr<PropertiesAdmin>;
81
84
  using PropertiesAdminPrxPtr = ::std::shared_ptr<PropertiesAdminPrx>;
82
85
 
83
86
  }
87
+ /// \endcond
84
88
 
85
89
  #else // C++98 mapping
86
90
 
@@ -91,8 +95,10 @@ namespace Ice
91
95
  {
92
96
 
93
97
  class PropertiesAdmin;
98
+ /// \cond INTERNAL
94
99
  ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin>&);
95
100
  ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::PropertiesAdmin*);
101
+ /// \endcond
96
102
 
97
103
  }
98
104
 
@@ -102,22 +108,30 @@ namespace Ice
102
108
  {
103
109
 
104
110
  class Properties;
105
- ICE_API ::Ice::LocalObject* upCast(::Ice::Properties*);
106
- typedef ::IceInternal::Handle< ::Ice::Properties> PropertiesPtr;
111
+ /// \cond INTERNAL
112
+ ICE_API LocalObject* upCast(Properties*);
113
+ /// \endcond
114
+ typedef ::IceInternal::Handle< Properties> PropertiesPtr;
107
115
 
108
116
  class PropertiesAdmin;
109
- ICE_API ::Ice::Object* upCast(::Ice::PropertiesAdmin*);
110
- typedef ::IceInternal::Handle< ::Ice::PropertiesAdmin> PropertiesAdminPtr;
117
+ /// \cond INTERNAL
118
+ ICE_API Object* upCast(PropertiesAdmin*);
119
+ /// \endcond
120
+ typedef ::IceInternal::Handle< PropertiesAdmin> PropertiesAdminPtr;
111
121
  typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin> PropertiesAdminPrx;
112
122
  typedef PropertiesAdminPrx PropertiesAdminPrxPtr;
113
- ICE_API void _icePatchObjectPtr(PropertiesAdminPtr&, const ::Ice::ObjectPtr&);
123
+ /// \cond INTERNAL
124
+ ICE_API void _icePatchObjectPtr(PropertiesAdminPtr&, const ObjectPtr&);
125
+ /// \endcond
114
126
 
115
127
  }
116
128
 
129
+ /// \cond STREAM
117
130
  namespace Ice
118
131
  {
119
132
 
120
133
  }
134
+ /// \endcond
121
135
 
122
136
  #endif
123
137
 
@@ -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
@@ -79,32 +79,80 @@ class LoggerAdminPrx;
79
79
  namespace Ice
80
80
  {
81
81
 
82
+ /**
83
+ * An enumeration representing the different types of log messages.
84
+ */
82
85
  enum class LogMessageType : unsigned char
83
86
  {
87
+ /**
88
+ * The {@link Logger} received a print message.
89
+ */
84
90
  PrintMessage,
91
+ /**
92
+ * The {@link Logger} received a trace message.
93
+ */
85
94
  TraceMessage,
95
+ /**
96
+ * The {@link Logger} received a warning message.
97
+ */
86
98
  WarningMessage,
99
+ /**
100
+ * The {@link Logger} received an error message.
101
+ */
87
102
  ErrorMessage
88
103
  };
89
104
 
90
- using LogMessageTypeSeq = ::std::vector<::Ice::LogMessageType>;
105
+ /**
106
+ * A sequence of {@link LogMessageType}
107
+ */
108
+ using LogMessageTypeSeq = ::std::vector<LogMessageType>;
91
109
 
110
+ /**
111
+ * A complete log message.
112
+ * \headerfile Ice/Ice.h
113
+ */
92
114
  struct LogMessage
93
115
  {
94
- ::Ice::LogMessageType type;
116
+ /**
117
+ * The type of message sent to the {@link Logger}.
118
+ */
119
+ LogMessageType type;
120
+ /**
121
+ * The date and time when the {@link Logger} received this message, expressed
122
+ * as the number of microseconds since the Unix Epoch (00:00:00 UTC on 1 January 1970)
123
+ */
95
124
  long long int timestamp;
125
+ /**
126
+ * For a message of type trace, the trace category of this log message;
127
+ * otherwise, the empty string.
128
+ */
96
129
  ::std::string traceCategory;
130
+ /**
131
+ * The log message itself.
132
+ */
97
133
  ::std::string message;
98
134
 
99
- std::tuple<const ::Ice::LogMessageType&, const long long int&, const ::std::string&, const ::std::string&> ice_tuple() const
135
+ /**
136
+ * Obtains a tuple containing all of the exception's data members.
137
+ * @return The data members in a tuple.
138
+ */
139
+
140
+ std::tuple<const LogMessageType&, const long long int&, const ::std::string&, const ::std::string&> ice_tuple() const
100
141
  {
101
142
  return std::tie(type, timestamp, traceCategory, message);
102
143
  }
103
144
  };
104
145
 
146
+ /**
147
+ * A sequence of {@link LogMessage}.
148
+ */
105
149
  using LogMessageSeq = std::list<LogMessage>;
106
150
 
107
- class ICE_CLASS(ICE_API) RemoteLoggerAlreadyAttachedException : public ::Ice::UserExceptionHelper<RemoteLoggerAlreadyAttachedException, ::Ice::UserException>
151
+ /**
152
+ * Thrown when the provided RemoteLogger was previously attached to a LoggerAdmin.
153
+ * \headerfile Ice/Ice.h
154
+ */
155
+ class ICE_CLASS(ICE_API) RemoteLoggerAlreadyAttachedException : public UserExceptionHelper<RemoteLoggerAlreadyAttachedException, UserException>
108
156
  {
109
157
  public:
110
158
 
@@ -114,15 +162,26 @@ public:
114
162
 
115
163
  RemoteLoggerAlreadyAttachedException() = default;
116
164
 
165
+ /**
166
+ * Obtains a tuple containing all of the exception's data members.
167
+ * @return The data members in a tuple.
168
+ */
169
+
117
170
  std::tuple<> ice_tuple() const
118
171
  {
119
172
  return std::tie();
120
173
  }
121
174
 
175
+ /**
176
+ * Obtains the Slice type ID of this exception.
177
+ * @return The fully-scoped type ID.
178
+ */
122
179
  ICE_MEMBER(ICE_API) static const ::std::string& ice_staticId();
123
180
  };
124
181
 
182
+ /// \cond INTERNAL
125
183
  static RemoteLoggerAlreadyAttachedException _iceS_RemoteLoggerAlreadyAttachedException_init;
184
+ /// \endcond
126
185
 
127
186
  using Ice::operator<;
128
187
  using Ice::operator<=;
@@ -136,55 +195,174 @@ using Ice::operator!=;
136
195
  namespace Ice
137
196
  {
138
197
 
139
- class ICE_API RemoteLogger : public virtual ::Ice::Object
198
+ /**
199
+ * The Ice remote logger interface. An application can implement a
200
+ * RemoteLogger to receive the log messages sent to the local {@link Logger}
201
+ * of another Ice application.
202
+ * \headerfile Ice/Ice.h
203
+ */
204
+ class ICE_API RemoteLogger : public virtual Object
140
205
  {
141
206
  public:
142
207
 
143
208
  using ProxyType = RemoteLoggerPrx;
144
209
 
145
- virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
146
- virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
147
- virtual ::std::string ice_id(const ::Ice::Current&) const override;
148
-
210
+ /**
211
+ * Determines whether this object supports an interface with the given Slice type ID.
212
+ * @param id The fully-scoped Slice type ID.
213
+ * @param current The Current object for the invocation.
214
+ * @return True if this object supports the interface, false, otherwise.
215
+ */
216
+ virtual bool ice_isA(::std::string id, const Current& current) const override;
217
+
218
+ /**
219
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
220
+ * @param current The Current object for the invocation.
221
+ * @return A list of fully-scoped type IDs.
222
+ */
223
+ virtual ::std::vector<::std::string> ice_ids(const Current& current) const override;
224
+
225
+ /**
226
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
227
+ * @param current The Current object for the invocation.
228
+ * @return A fully-scoped type ID.
229
+ */
230
+ virtual ::std::string ice_id(const Current& current) const override;
231
+
232
+ /**
233
+ * Obtains the Slice type ID corresponding to this class.
234
+ * @return A fully-scoped type ID.
235
+ */
149
236
  static const ::std::string& ice_staticId();
150
237
 
151
- virtual void init(::std::string, ::Ice::LogMessageSeq, const ::Ice::Current&) = 0;
152
- bool _iceD_init(::IceInternal::Incoming&, const ::Ice::Current&);
153
-
154
- virtual void log(::Ice::LogMessage, const ::Ice::Current&) = 0;
155
- bool _iceD_log(::IceInternal::Incoming&, const ::Ice::Current&);
156
-
157
- virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
238
+ /**
239
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
240
+ * @param prefix The prefix of the associated local Logger.
241
+ * @param logMessages Old log messages generated before "now".
242
+ * @param current The Current object for the invocation.
243
+ */
244
+ virtual void init(::std::string prefix, LogMessageSeq logMessages, const Current& current) = 0;
245
+ /// \cond INTERNAL
246
+ bool _iceD_init(::IceInternal::Incoming&, const Current&);
247
+ /// \endcond
248
+
249
+ /**
250
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
251
+ * @param message The message to log.
252
+ * @param current The Current object for the invocation.
253
+ */
254
+ virtual void log(LogMessage message, const Current& current) = 0;
255
+ /// \cond INTERNAL
256
+ bool _iceD_log(::IceInternal::Incoming&, const Current&);
257
+ /// \endcond
258
+
259
+ /// \cond INTERNAL
260
+ virtual bool _iceDispatch(::IceInternal::Incoming&, const Current&) override;
261
+ /// \endcond
158
262
  };
159
263
 
160
- class ICE_API LoggerAdmin : public virtual ::Ice::Object
264
+ /**
265
+ * The interface of the admin object that allows an Ice application the attach its
266
+ * {@link RemoteLogger} to the {@link Logger} of this admin object's Ice communicator.
267
+ * \headerfile Ice/Ice.h
268
+ */
269
+ class ICE_API LoggerAdmin : public virtual Object
161
270
  {
162
271
  public:
163
272
 
164
273
  using ProxyType = LoggerAdminPrx;
165
274
 
166
- virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
167
- virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
168
- virtual ::std::string ice_id(const ::Ice::Current&) const override;
169
-
275
+ /**
276
+ * Determines whether this object supports an interface with the given Slice type ID.
277
+ * @param id The fully-scoped Slice type ID.
278
+ * @param current The Current object for the invocation.
279
+ * @return True if this object supports the interface, false, otherwise.
280
+ */
281
+ virtual bool ice_isA(::std::string id, const Current& current) const override;
282
+
283
+ /**
284
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
285
+ * @param current The Current object for the invocation.
286
+ * @return A list of fully-scoped type IDs.
287
+ */
288
+ virtual ::std::vector<::std::string> ice_ids(const Current& current) const override;
289
+
290
+ /**
291
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
292
+ * @param current The Current object for the invocation.
293
+ * @return A fully-scoped type ID.
294
+ */
295
+ virtual ::std::string ice_id(const Current& current) const override;
296
+
297
+ /**
298
+ * Obtains the Slice type ID corresponding to this class.
299
+ * @return A fully-scoped type ID.
300
+ */
170
301
  static const ::std::string& ice_staticId();
171
302
 
172
- virtual void attachRemoteLogger(::std::shared_ptr<::Ice::RemoteLoggerPrx>, ::Ice::LogMessageTypeSeq, ::Ice::StringSeq, int, const ::Ice::Current&) = 0;
173
- bool _iceD_attachRemoteLogger(::IceInternal::Incoming&, const ::Ice::Current&);
174
-
175
- virtual bool detachRemoteLogger(::std::shared_ptr<::Ice::RemoteLoggerPrx>, const ::Ice::Current&) = 0;
176
- bool _iceD_detachRemoteLogger(::IceInternal::Incoming&, const ::Ice::Current&);
177
-
303
+ /**
304
+ * Attaches a RemoteLogger object to the local logger.
305
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
306
+ * @param prx A proxy to the remote logger.
307
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
308
+ * An empty list means no filtering (send all message types).
309
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
310
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
311
+ * An empty list means no filtering (send all trace categories).
312
+ * @param messageMax The maximum number of log messages (of all types) to be provided
313
+ * to init. A negative value requests all messages available.
314
+ * @param current The Current object for the invocation.
315
+ * @throws Ice::RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
316
+ * attached to this admin object.
317
+ */
318
+ virtual void attachRemoteLogger(::std::shared_ptr<RemoteLoggerPrx> prx, LogMessageTypeSeq messageTypes, StringSeq traceCategories, int messageMax, const Current& current) = 0;
319
+ /// \cond INTERNAL
320
+ bool _iceD_attachRemoteLogger(::IceInternal::Incoming&, const Current&);
321
+ /// \endcond
322
+
323
+ /**
324
+ * Detaches a RemoteLogger object from the local logger.
325
+ * @param prx A proxy to the remote logger.
326
+ * @param current The Current object for the invocation.
327
+ * @return True if the provided remote logger proxy was detached, and false otherwise.
328
+ */
329
+ virtual bool detachRemoteLogger(::std::shared_ptr<RemoteLoggerPrx> prx, const Current& current) = 0;
330
+ /// \cond INTERNAL
331
+ bool _iceD_detachRemoteLogger(::IceInternal::Incoming&, const Current&);
332
+ /// \endcond
333
+
334
+ /**
335
+ * Encapsulates the results of a call to getLog.
336
+ */
178
337
  struct GetLogResult
179
338
  {
180
- ::Ice::LogMessageSeq returnValue;
339
+ /** The Log messages. */
340
+ LogMessageSeq returnValue;
341
+ /** The prefix of the associated local logger. */
181
342
  ::std::string prefix;
182
343
  };
183
344
 
184
- virtual ::Ice::LogMessageSeq getLog(::Ice::LogMessageTypeSeq, ::Ice::StringSeq, int, ::std::string&, const ::Ice::Current&) = 0;
185
- bool _iceD_getLog(::IceInternal::Incoming&, const ::Ice::Current&);
186
-
187
- virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
345
+ /**
346
+ * Retrieves log messages recently logged.
347
+ * @param messageTypes The list of message types that the caller wishes to receive.
348
+ * An empty list means no filtering (send all message types).
349
+ * @param traceCategories The categories of traces that caller wish to receive.
350
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
351
+ * An empty list means no filtering (send all trace categories).
352
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
353
+ * A negative value requests all messages available.
354
+ * @param prefix The prefix of the associated local logger.
355
+ * @param current The Current object for the invocation.
356
+ * @return The Log messages.
357
+ */
358
+ virtual LogMessageSeq getLog(LogMessageTypeSeq messageTypes, StringSeq traceCategories, int messageMax, ::std::string& prefix, const Current& current) = 0;
359
+ /// \cond INTERNAL
360
+ bool _iceD_getLog(::IceInternal::Incoming&, const Current&);
361
+ /// \endcond
362
+
363
+ /// \cond INTERNAL
364
+ virtual bool _iceDispatch(::IceInternal::Incoming&, const Current&) override;
365
+ /// \endcond
188
366
  };
189
367
 
190
368
  }
@@ -192,162 +370,346 @@ public:
192
370
  namespace Ice
193
371
  {
194
372
 
195
- class ICE_CLASS(ICE_API) RemoteLoggerPrx : public virtual ::Ice::Proxy<RemoteLoggerPrx, ::Ice::ObjectPrx>
373
+ /**
374
+ * The Ice remote logger interface. An application can implement a
375
+ * RemoteLogger to receive the log messages sent to the local {@link Logger}
376
+ * of another Ice application.
377
+ * \headerfile Ice/Ice.h
378
+ */
379
+ class ICE_CLASS(ICE_API) RemoteLoggerPrx : public virtual Proxy<RemoteLoggerPrx, ObjectPrx>
196
380
  {
197
381
  public:
198
382
 
199
- void init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context = Ice::noExplicitContext)
383
+ /**
384
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
385
+ * @param prefix The prefix of the associated local Logger.
386
+ * @param logMessages Old log messages generated before "now".
387
+ * @param context The Context map to send with the invocation.
388
+ */
389
+ void init(const ::std::string& prefix, const LogMessageSeq& logMessages, const Context& context = noExplicitContext)
200
390
  {
201
- _makePromiseOutgoing<void>(true, this, &Ice::RemoteLoggerPrx::_iceI_init, iceP_prefix, iceP_logMessages, context).get();
391
+ _makePromiseOutgoing<void>(true, this, &RemoteLoggerPrx::_iceI_init, prefix, logMessages, context).get();
202
392
  }
203
393
 
394
+ /**
395
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
396
+ * @param prefix The prefix of the associated local Logger.
397
+ * @param logMessages Old log messages generated before "now".
398
+ * @param context The Context map to send with the invocation.
399
+ * @return The future object for the invocation.
400
+ */
204
401
  template<template<typename> class P = ::std::promise>
205
- auto initAsync(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context = Ice::noExplicitContext)
402
+ auto initAsync(const ::std::string& prefix, const LogMessageSeq& logMessages, const Context& context = noExplicitContext)
206
403
  -> decltype(::std::declval<P<void>>().get_future())
207
404
  {
208
- return _makePromiseOutgoing<void, P>(false, this, &Ice::RemoteLoggerPrx::_iceI_init, iceP_prefix, iceP_logMessages, context);
405
+ return _makePromiseOutgoing<void, P>(false, this, &RemoteLoggerPrx::_iceI_init, prefix, logMessages, context);
209
406
  }
210
407
 
408
+ /**
409
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
410
+ * @param prefix The prefix of the associated local Logger.
411
+ * @param logMessages Old log messages generated before "now".
412
+ * @param response The response callback.
413
+ * @param ex The exception callback.
414
+ * @param sent The sent callback.
415
+ * @param context The Context map to send with the invocation.
416
+ * @return A function that can be called to cancel the invocation locally.
417
+ */
211
418
  ::std::function<void()>
212
- initAsync(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages,
419
+ initAsync(const ::std::string& prefix, const LogMessageSeq& logMessages,
213
420
  ::std::function<void()> response,
214
421
  ::std::function<void(::std::exception_ptr)> ex = nullptr,
215
422
  ::std::function<void(bool)> sent = nullptr,
216
- const ::Ice::Context& context = Ice::noExplicitContext)
423
+ const Context& context = noExplicitContext)
217
424
  {
218
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::RemoteLoggerPrx::_iceI_init, iceP_prefix, iceP_logMessages, context);
425
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &RemoteLoggerPrx::_iceI_init, prefix, logMessages, context);
219
426
  }
220
427
 
221
- ICE_MEMBER(ICE_API) void _iceI_init(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const ::Ice::LogMessageSeq&, const ::Ice::Context&);
428
+ /// \cond INTERNAL
429
+ ICE_MEMBER(ICE_API) void _iceI_init(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const LogMessageSeq&, const Context&);
430
+ /// \endcond
222
431
 
223
- void log(const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context = Ice::noExplicitContext)
432
+ /**
433
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
434
+ * @param message The message to log.
435
+ * @param context The Context map to send with the invocation.
436
+ */
437
+ void log(const LogMessage& message, const Context& context = noExplicitContext)
224
438
  {
225
- _makePromiseOutgoing<void>(true, this, &Ice::RemoteLoggerPrx::_iceI_log, iceP_message, context).get();
439
+ _makePromiseOutgoing<void>(true, this, &RemoteLoggerPrx::_iceI_log, message, context).get();
226
440
  }
227
441
 
442
+ /**
443
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
444
+ * @param message The message to log.
445
+ * @param context The Context map to send with the invocation.
446
+ * @return The future object for the invocation.
447
+ */
228
448
  template<template<typename> class P = ::std::promise>
229
- auto logAsync(const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context = Ice::noExplicitContext)
449
+ auto logAsync(const LogMessage& message, const Context& context = noExplicitContext)
230
450
  -> decltype(::std::declval<P<void>>().get_future())
231
451
  {
232
- return _makePromiseOutgoing<void, P>(false, this, &Ice::RemoteLoggerPrx::_iceI_log, iceP_message, context);
452
+ return _makePromiseOutgoing<void, P>(false, this, &RemoteLoggerPrx::_iceI_log, message, context);
233
453
  }
234
454
 
455
+ /**
456
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
457
+ * @param message The message to log.
458
+ * @param response The response callback.
459
+ * @param ex The exception callback.
460
+ * @param sent The sent callback.
461
+ * @param context The Context map to send with the invocation.
462
+ * @return A function that can be called to cancel the invocation locally.
463
+ */
235
464
  ::std::function<void()>
236
- logAsync(const ::Ice::LogMessage& iceP_message,
465
+ logAsync(const LogMessage& message,
237
466
  ::std::function<void()> response,
238
467
  ::std::function<void(::std::exception_ptr)> ex = nullptr,
239
468
  ::std::function<void(bool)> sent = nullptr,
240
- const ::Ice::Context& context = Ice::noExplicitContext)
469
+ const Context& context = noExplicitContext)
241
470
  {
242
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::RemoteLoggerPrx::_iceI_log, iceP_message, context);
471
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &RemoteLoggerPrx::_iceI_log, message, context);
243
472
  }
244
473
 
245
- ICE_MEMBER(ICE_API) void _iceI_log(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::Ice::LogMessage&, const ::Ice::Context&);
474
+ /// \cond INTERNAL
475
+ ICE_MEMBER(ICE_API) void _iceI_log(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const LogMessage&, const Context&);
476
+ /// \endcond
246
477
 
478
+ /**
479
+ * Obtains the Slice type ID of this interface.
480
+ * @return The fully-scoped type ID.
481
+ */
247
482
  ICE_MEMBER(ICE_API) static const ::std::string& ice_staticId();
248
483
 
249
484
  protected:
250
485
 
486
+ /// \cond INTERNAL
251
487
  RemoteLoggerPrx() = default;
252
488
  friend ::std::shared_ptr<RemoteLoggerPrx> IceInternal::createProxy<RemoteLoggerPrx>();
253
489
 
254
- ICE_MEMBER(ICE_API) virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
490
+ ICE_MEMBER(ICE_API) virtual ::std::shared_ptr<ObjectPrx> _newInstance() const override;
491
+ /// \endcond
255
492
  };
256
493
 
257
- class ICE_CLASS(ICE_API) LoggerAdminPrx : public virtual ::Ice::Proxy<LoggerAdminPrx, ::Ice::ObjectPrx>
494
+ /**
495
+ * The interface of the admin object that allows an Ice application the attach its
496
+ * {@link RemoteLogger} to the {@link Logger} of this admin object's Ice communicator.
497
+ * \headerfile Ice/Ice.h
498
+ */
499
+ class ICE_CLASS(ICE_API) LoggerAdminPrx : public virtual Proxy<LoggerAdminPrx, ObjectPrx>
258
500
  {
259
501
  public:
260
502
 
261
- void attachRemoteLogger(const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context = Ice::noExplicitContext)
262
- {
263
- _makePromiseOutgoing<void>(true, this, &Ice::LoggerAdminPrx::_iceI_attachRemoteLogger, iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context).get();
264
- }
265
-
503
+ /**
504
+ * Attaches a RemoteLogger object to the local logger.
505
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
506
+ * @param prx A proxy to the remote logger.
507
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
508
+ * An empty list means no filtering (send all message types).
509
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
510
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
511
+ * An empty list means no filtering (send all trace categories).
512
+ * @param messageMax The maximum number of log messages (of all types) to be provided
513
+ * to init. A negative value requests all messages available.
514
+ * @param context The Context map to send with the invocation.
515
+ * @throws Ice::RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
516
+ * attached to this admin object.
517
+ */
518
+ void attachRemoteLogger(const ::std::shared_ptr<RemoteLoggerPrx>& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, const Context& context = noExplicitContext)
519
+ {
520
+ _makePromiseOutgoing<void>(true, this, &LoggerAdminPrx::_iceI_attachRemoteLogger, prx, messageTypes, traceCategories, messageMax, context).get();
521
+ }
522
+
523
+ /**
524
+ * Attaches a RemoteLogger object to the local logger.
525
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
526
+ * @param prx A proxy to the remote logger.
527
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
528
+ * An empty list means no filtering (send all message types).
529
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
530
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
531
+ * An empty list means no filtering (send all trace categories).
532
+ * @param messageMax The maximum number of log messages (of all types) to be provided
533
+ * to init. A negative value requests all messages available.
534
+ * @param context The Context map to send with the invocation.
535
+ * @return The future object for the invocation.
536
+ */
266
537
  template<template<typename> class P = ::std::promise>
267
- auto attachRemoteLoggerAsync(const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context = Ice::noExplicitContext)
538
+ auto attachRemoteLoggerAsync(const ::std::shared_ptr<RemoteLoggerPrx>& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, const Context& context = noExplicitContext)
268
539
  -> decltype(::std::declval<P<void>>().get_future())
269
540
  {
270
- return _makePromiseOutgoing<void, P>(false, this, &Ice::LoggerAdminPrx::_iceI_attachRemoteLogger, iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context);
271
- }
272
-
541
+ return _makePromiseOutgoing<void, P>(false, this, &LoggerAdminPrx::_iceI_attachRemoteLogger, prx, messageTypes, traceCategories, messageMax, context);
542
+ }
543
+
544
+ /**
545
+ * Attaches a RemoteLogger object to the local logger.
546
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
547
+ * @param prx A proxy to the remote logger.
548
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
549
+ * An empty list means no filtering (send all message types).
550
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
551
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
552
+ * An empty list means no filtering (send all trace categories).
553
+ * @param messageMax The maximum number of log messages (of all types) to be provided
554
+ * to init. A negative value requests all messages available.
555
+ * @param response The response callback.
556
+ * @param ex The exception callback.
557
+ * @param sent The sent callback.
558
+ * @param context The Context map to send with the invocation.
559
+ * @return A function that can be called to cancel the invocation locally.
560
+ */
273
561
  ::std::function<void()>
274
- attachRemoteLoggerAsync(const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax,
562
+ attachRemoteLoggerAsync(const ::std::shared_ptr<RemoteLoggerPrx>& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax,
275
563
  ::std::function<void()> response,
276
564
  ::std::function<void(::std::exception_ptr)> ex = nullptr,
277
565
  ::std::function<void(bool)> sent = nullptr,
278
- const ::Ice::Context& context = Ice::noExplicitContext)
566
+ const Context& context = noExplicitContext)
279
567
  {
280
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LoggerAdminPrx::_iceI_attachRemoteLogger, iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context);
568
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &LoggerAdminPrx::_iceI_attachRemoteLogger, prx, messageTypes, traceCategories, messageMax, context);
281
569
  }
282
570
 
283
- ICE_MEMBER(ICE_API) void _iceI_attachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::shared_ptr<::Ice::RemoteLoggerPrx>&, const ::Ice::LogMessageTypeSeq&, const ::Ice::StringSeq&, int, const ::Ice::Context&);
571
+ /// \cond INTERNAL
572
+ ICE_MEMBER(ICE_API) void _iceI_attachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::shared_ptr<RemoteLoggerPrx>&, const LogMessageTypeSeq&, const StringSeq&, int, const Context&);
573
+ /// \endcond
284
574
 
285
- bool detachRemoteLogger(const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
575
+ /**
576
+ * Detaches a RemoteLogger object from the local logger.
577
+ * @param prx A proxy to the remote logger.
578
+ * @param context The Context map to send with the invocation.
579
+ * @return True if the provided remote logger proxy was detached, and false otherwise.
580
+ */
581
+ bool detachRemoteLogger(const ::std::shared_ptr<RemoteLoggerPrx>& prx, const Context& context = noExplicitContext)
286
582
  {
287
- return _makePromiseOutgoing<bool>(true, this, &Ice::LoggerAdminPrx::_iceI_detachRemoteLogger, iceP_prx, context).get();
583
+ return _makePromiseOutgoing<bool>(true, this, &LoggerAdminPrx::_iceI_detachRemoteLogger, prx, context).get();
288
584
  }
289
585
 
586
+ /**
587
+ * Detaches a RemoteLogger object from the local logger.
588
+ * @param prx A proxy to the remote logger.
589
+ * @param context The Context map to send with the invocation.
590
+ * @return The future object for the invocation.
591
+ */
290
592
  template<template<typename> class P = ::std::promise>
291
- auto detachRemoteLoggerAsync(const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
593
+ auto detachRemoteLoggerAsync(const ::std::shared_ptr<RemoteLoggerPrx>& prx, const Context& context = noExplicitContext)
292
594
  -> decltype(::std::declval<P<bool>>().get_future())
293
595
  {
294
- return _makePromiseOutgoing<bool, P>(false, this, &Ice::LoggerAdminPrx::_iceI_detachRemoteLogger, iceP_prx, context);
596
+ return _makePromiseOutgoing<bool, P>(false, this, &LoggerAdminPrx::_iceI_detachRemoteLogger, prx, context);
295
597
  }
296
598
 
599
+ /**
600
+ * Detaches a RemoteLogger object from the local logger.
601
+ * @param prx A proxy to the remote logger.
602
+ * @param response The response callback.
603
+ * @param ex The exception callback.
604
+ * @param sent The sent callback.
605
+ * @param context The Context map to send with the invocation.
606
+ * @return A function that can be called to cancel the invocation locally.
607
+ */
297
608
  ::std::function<void()>
298
- detachRemoteLoggerAsync(const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx,
609
+ detachRemoteLoggerAsync(const ::std::shared_ptr<RemoteLoggerPrx>& prx,
299
610
  ::std::function<void(bool)> response,
300
611
  ::std::function<void(::std::exception_ptr)> ex = nullptr,
301
612
  ::std::function<void(bool)> sent = nullptr,
302
- const ::Ice::Context& context = Ice::noExplicitContext)
303
- {
304
- return _makeLamdaOutgoing<bool>(response, ex, sent, this, &Ice::LoggerAdminPrx::_iceI_detachRemoteLogger, iceP_prx, context);
305
- }
306
-
307
- ICE_MEMBER(ICE_API) void _iceI_detachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<bool>>&, const ::std::shared_ptr<::Ice::RemoteLoggerPrx>&, const ::Ice::Context&);
308
-
309
- ::Ice::LogMessageSeq getLog(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax, ::std::string& iceP_prefix, const ::Ice::Context& context = Ice::noExplicitContext)
310
- {
311
- auto result = _makePromiseOutgoing<::Ice::LoggerAdmin::GetLogResult>(true, this, &Ice::LoggerAdminPrx::_iceI_getLog, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context).get();
312
- iceP_prefix = ::std::move(result.prefix);
313
- return ::std::move(result.returnValue);
314
- }
315
-
613
+ const Context& context = noExplicitContext)
614
+ {
615
+ return _makeLamdaOutgoing<bool>(response, ex, sent, this, &LoggerAdminPrx::_iceI_detachRemoteLogger, prx, context);
616
+ }
617
+
618
+ /// \cond INTERNAL
619
+ ICE_MEMBER(ICE_API) void _iceI_detachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<bool>>&, const ::std::shared_ptr<RemoteLoggerPrx>&, const Context&);
620
+ /// \endcond
621
+
622
+ /**
623
+ * Retrieves log messages recently logged.
624
+ * @param messageTypes The list of message types that the caller wishes to receive.
625
+ * An empty list means no filtering (send all message types).
626
+ * @param traceCategories The categories of traces that caller wish to receive.
627
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
628
+ * An empty list means no filtering (send all trace categories).
629
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
630
+ * A negative value requests all messages available.
631
+ * @param prefix The prefix of the associated local logger.
632
+ * @param context The Context map to send with the invocation.
633
+ * @return The Log messages.
634
+ */
635
+ LogMessageSeq getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, ::std::string& prefix, const Context& context = noExplicitContext)
636
+ {
637
+ auto _result = _makePromiseOutgoing<LoggerAdmin::GetLogResult>(true, this, &LoggerAdminPrx::_iceI_getLog, messageTypes, traceCategories, messageMax, context).get();
638
+ prefix = ::std::move(_result.prefix);
639
+ return ::std::move(_result.returnValue);
640
+ }
641
+
642
+ /**
643
+ * Retrieves log messages recently logged.
644
+ * @param messageTypes The list of message types that the caller wishes to receive.
645
+ * An empty list means no filtering (send all message types).
646
+ * @param traceCategories The categories of traces that caller wish to receive.
647
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
648
+ * An empty list means no filtering (send all trace categories).
649
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
650
+ * A negative value requests all messages available.
651
+ * @param context The Context map to send with the invocation.
652
+ * @return The future object for the invocation.
653
+ */
316
654
  template<template<typename> class P = ::std::promise>
317
- auto getLogAsync(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context = Ice::noExplicitContext)
318
- -> decltype(::std::declval<P<::Ice::LoggerAdmin::GetLogResult>>().get_future())
319
- {
320
- return _makePromiseOutgoing<::Ice::LoggerAdmin::GetLogResult, P>(false, this, &Ice::LoggerAdminPrx::_iceI_getLog, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context);
321
- }
322
-
655
+ auto getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, const Context& context = noExplicitContext)
656
+ -> decltype(::std::declval<P<LoggerAdmin::GetLogResult>>().get_future())
657
+ {
658
+ return _makePromiseOutgoing<LoggerAdmin::GetLogResult, P>(false, this, &LoggerAdminPrx::_iceI_getLog, messageTypes, traceCategories, messageMax, context);
659
+ }
660
+
661
+ /**
662
+ * Retrieves log messages recently logged.
663
+ * @param messageTypes The list of message types that the caller wishes to receive.
664
+ * An empty list means no filtering (send all message types).
665
+ * @param traceCategories The categories of traces that caller wish to receive.
666
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
667
+ * An empty list means no filtering (send all trace categories).
668
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
669
+ * A negative value requests all messages available.
670
+ * @param response The response callback.
671
+ * @param ex The exception callback.
672
+ * @param sent The sent callback.
673
+ * @param context The Context map to send with the invocation.
674
+ * @return A function that can be called to cancel the invocation locally.
675
+ */
323
676
  ::std::function<void()>
324
- getLogAsync(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax,
325
- ::std::function<void(::Ice::LogMessageSeq, ::std::string)> response,
677
+ getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax,
678
+ ::std::function<void(LogMessageSeq, ::std::string)> response,
326
679
  ::std::function<void(::std::exception_ptr)> ex = nullptr,
327
680
  ::std::function<void(bool)> sent = nullptr,
328
- const ::Ice::Context& context = Ice::noExplicitContext)
681
+ const Context& context = noExplicitContext)
329
682
  {
330
- auto responseCb = [response](::Ice::LoggerAdmin::GetLogResult&& result)
683
+ auto _responseCb = [response](LoggerAdmin::GetLogResult&& _result)
331
684
  {
332
- response(::std::move(result.returnValue), ::std::move(result.prefix));
685
+ response(::std::move(_result.returnValue), ::std::move(_result.prefix));
333
686
  };
334
- return _makeLamdaOutgoing<::Ice::LoggerAdmin::GetLogResult>(responseCb, ex, sent, this, &Ice::LoggerAdminPrx::_iceI_getLog, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context);
687
+ return _makeLamdaOutgoing<LoggerAdmin::GetLogResult>(_responseCb, ex, sent, this, &LoggerAdminPrx::_iceI_getLog, messageTypes, traceCategories, messageMax, context);
335
688
  }
336
689
 
337
- ICE_MEMBER(ICE_API) void _iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::LoggerAdmin::GetLogResult>>&, const ::Ice::LogMessageTypeSeq&, const ::Ice::StringSeq&, int, const ::Ice::Context&);
690
+ /// \cond INTERNAL
691
+ ICE_MEMBER(ICE_API) void _iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<LoggerAdmin::GetLogResult>>&, const LogMessageTypeSeq&, const StringSeq&, int, const Context&);
692
+ /// \endcond
338
693
 
694
+ /**
695
+ * Obtains the Slice type ID of this interface.
696
+ * @return The fully-scoped type ID.
697
+ */
339
698
  ICE_MEMBER(ICE_API) static const ::std::string& ice_staticId();
340
699
 
341
700
  protected:
342
701
 
702
+ /// \cond INTERNAL
343
703
  LoggerAdminPrx() = default;
344
704
  friend ::std::shared_ptr<LoggerAdminPrx> IceInternal::createProxy<LoggerAdminPrx>();
345
705
 
346
- ICE_MEMBER(ICE_API) virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
706
+ ICE_MEMBER(ICE_API) virtual ::std::shared_ptr<ObjectPrx> _newInstance() const override;
707
+ /// \endcond
347
708
  };
348
709
 
349
710
  }
350
711
 
712
+ /// \cond STREAM
351
713
  namespace Ice
352
714
  {
353
715
 
@@ -379,7 +741,9 @@ struct StreamReader<::Ice::LogMessage, S>
379
741
  };
380
742
 
381
743
  }
744
+ /// \endcond
382
745
 
746
+ /// \cond INTERNAL
383
747
  namespace Ice
384
748
  {
385
749
 
@@ -390,6 +754,7 @@ using LoggerAdminPtr = ::std::shared_ptr<LoggerAdmin>;
390
754
  using LoggerAdminPrxPtr = ::std::shared_ptr<LoggerAdminPrx>;
391
755
 
392
756
  }
757
+ /// \endcond
393
758
 
394
759
  #else // C++98 mapping
395
760
 
@@ -400,12 +765,16 @@ namespace Ice
400
765
  {
401
766
 
402
767
  class RemoteLogger;
768
+ /// \cond INTERNAL
403
769
  ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger>&);
404
770
  ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::RemoteLogger*);
771
+ /// \endcond
405
772
 
406
773
  class LoggerAdmin;
774
+ /// \cond INTERNAL
407
775
  ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin>&);
408
776
  ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::LoggerAdmin*);
777
+ /// \endcond
409
778
 
410
779
  }
411
780
 
@@ -415,39 +784,83 @@ namespace Ice
415
784
  {
416
785
 
417
786
  class RemoteLogger;
418
- ICE_API ::Ice::Object* upCast(::Ice::RemoteLogger*);
419
- typedef ::IceInternal::Handle< ::Ice::RemoteLogger> RemoteLoggerPtr;
787
+ /// \cond INTERNAL
788
+ ICE_API Object* upCast(RemoteLogger*);
789
+ /// \endcond
790
+ typedef ::IceInternal::Handle< RemoteLogger> RemoteLoggerPtr;
420
791
  typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger> RemoteLoggerPrx;
421
792
  typedef RemoteLoggerPrx RemoteLoggerPrxPtr;
422
- ICE_API void _icePatchObjectPtr(RemoteLoggerPtr&, const ::Ice::ObjectPtr&);
793
+ /// \cond INTERNAL
794
+ ICE_API void _icePatchObjectPtr(RemoteLoggerPtr&, const ObjectPtr&);
795
+ /// \endcond
423
796
 
424
797
  class LoggerAdmin;
425
- ICE_API ::Ice::Object* upCast(::Ice::LoggerAdmin*);
426
- typedef ::IceInternal::Handle< ::Ice::LoggerAdmin> LoggerAdminPtr;
798
+ /// \cond INTERNAL
799
+ ICE_API Object* upCast(LoggerAdmin*);
800
+ /// \endcond
801
+ typedef ::IceInternal::Handle< LoggerAdmin> LoggerAdminPtr;
427
802
  typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin> LoggerAdminPrx;
428
803
  typedef LoggerAdminPrx LoggerAdminPrxPtr;
429
- ICE_API void _icePatchObjectPtr(LoggerAdminPtr&, const ::Ice::ObjectPtr&);
804
+ /// \cond INTERNAL
805
+ ICE_API void _icePatchObjectPtr(LoggerAdminPtr&, const ObjectPtr&);
806
+ /// \endcond
430
807
 
431
808
  }
432
809
 
433
810
  namespace Ice
434
811
  {
435
812
 
813
+ /**
814
+ * An enumeration representing the different types of log messages.
815
+ */
436
816
  enum LogMessageType
437
817
  {
818
+ /**
819
+ * The {@link Logger} received a print message.
820
+ */
438
821
  PrintMessage,
822
+ /**
823
+ * The {@link Logger} received a trace message.
824
+ */
439
825
  TraceMessage,
826
+ /**
827
+ * The {@link Logger} received a warning message.
828
+ */
440
829
  WarningMessage,
830
+ /**
831
+ * The {@link Logger} received an error message.
832
+ */
441
833
  ErrorMessage
442
834
  };
443
835
 
444
- typedef ::std::vector< ::Ice::LogMessageType> LogMessageTypeSeq;
836
+ /**
837
+ * A sequence of {@link LogMessageType}
838
+ */
839
+ typedef ::std::vector<Ice::LogMessageType> LogMessageTypeSeq;
445
840
 
841
+ /**
842
+ * A complete log message.
843
+ * \headerfile Ice/Ice.h
844
+ */
446
845
  struct LogMessage
447
846
  {
448
- ::Ice::LogMessageType type;
449
- ::Ice::Long timestamp;
847
+ /**
848
+ * The type of message sent to the {@link Logger}.
849
+ */
850
+ LogMessageType type;
851
+ /**
852
+ * The date and time when the {@link Logger} received this message, expressed
853
+ * as the number of microseconds since the Unix Epoch (00:00:00 UTC on 1 January 1970)
854
+ */
855
+ Long timestamp;
856
+ /**
857
+ * For a message of type trace, the trace category of this log message;
858
+ * otherwise, the empty string.
859
+ */
450
860
  ::std::string traceCategory;
861
+ /**
862
+ * The log message itself.
863
+ */
451
864
  ::std::string message;
452
865
 
453
866
  bool operator==(const LogMessage& rhs_) const
@@ -534,44 +947,91 @@ struct LogMessage
534
947
  }
535
948
  };
536
949
 
950
+ /**
951
+ * A sequence of {@link LogMessage}.
952
+ */
537
953
  typedef std::list<LogMessage> LogMessageSeq;
538
954
 
539
- class ICE_API RemoteLoggerAlreadyAttachedException : public ::Ice::UserException
955
+ /**
956
+ * Thrown when the provided RemoteLogger was previously attached to a LoggerAdmin.
957
+ * \headerfile Ice/Ice.h
958
+ */
959
+ class ICE_API RemoteLoggerAlreadyAttachedException : public UserException
540
960
  {
541
961
  public:
542
962
 
543
963
  RemoteLoggerAlreadyAttachedException() {}
544
964
  virtual ~RemoteLoggerAlreadyAttachedException() throw();
545
965
 
966
+ /**
967
+ * Obtains the Slice type ID of this exception.
968
+ * @return The fully-scoped type ID.
969
+ */
546
970
  virtual ::std::string ice_id() const;
971
+ /**
972
+ * Polymporphically clones this exception.
973
+ * @return A shallow copy of this exception.
974
+ */
547
975
  virtual RemoteLoggerAlreadyAttachedException* ice_clone() const;
976
+ /**
977
+ * Throws this exception.
978
+ */
548
979
  virtual void ice_throw() const;
549
980
 
550
981
  protected:
551
982
 
552
- virtual void _writeImpl(::Ice::OutputStream*) const;
553
- virtual void _readImpl(::Ice::InputStream*);
983
+ /// \cond STREAM
984
+ virtual void _writeImpl(OutputStream*) const;
985
+ virtual void _readImpl(InputStream*);
986
+ /// \endcond
554
987
  };
555
988
 
989
+ /// \cond INTERNAL
556
990
  static RemoteLoggerAlreadyAttachedException _iceS_RemoteLoggerAlreadyAttachedException_init;
991
+ /// \endcond
557
992
 
558
993
  }
559
994
 
560
995
  namespace Ice
561
996
  {
562
997
 
998
+ /**
999
+ * Base class for asynchronous callback wrapper classes used for calls to
1000
+ * IceProxy::Ice::RemoteLogger::begin_init.
1001
+ * Create a wrapper instance by calling ::Ice::newCallback_RemoteLogger_init.
1002
+ */
563
1003
  class Callback_RemoteLogger_init_Base : public virtual ::IceInternal::CallbackBase { };
564
1004
  typedef ::IceUtil::Handle< Callback_RemoteLogger_init_Base> Callback_RemoteLogger_initPtr;
565
1005
 
1006
+ /**
1007
+ * Base class for asynchronous callback wrapper classes used for calls to
1008
+ * IceProxy::Ice::RemoteLogger::begin_log.
1009
+ * Create a wrapper instance by calling ::Ice::newCallback_RemoteLogger_log.
1010
+ */
566
1011
  class Callback_RemoteLogger_log_Base : public virtual ::IceInternal::CallbackBase { };
567
1012
  typedef ::IceUtil::Handle< Callback_RemoteLogger_log_Base> Callback_RemoteLogger_logPtr;
568
1013
 
1014
+ /**
1015
+ * Base class for asynchronous callback wrapper classes used for calls to
1016
+ * IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
1017
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_attachRemoteLogger.
1018
+ */
569
1019
  class Callback_LoggerAdmin_attachRemoteLogger_Base : public virtual ::IceInternal::CallbackBase { };
570
1020
  typedef ::IceUtil::Handle< Callback_LoggerAdmin_attachRemoteLogger_Base> Callback_LoggerAdmin_attachRemoteLoggerPtr;
571
1021
 
1022
+ /**
1023
+ * Base class for asynchronous callback wrapper classes used for calls to
1024
+ * IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger.
1025
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_detachRemoteLogger.
1026
+ */
572
1027
  class Callback_LoggerAdmin_detachRemoteLogger_Base : public virtual ::IceInternal::CallbackBase { };
573
1028
  typedef ::IceUtil::Handle< Callback_LoggerAdmin_detachRemoteLogger_Base> Callback_LoggerAdmin_detachRemoteLoggerPtr;
574
1029
 
1030
+ /**
1031
+ * Base class for asynchronous callback wrapper classes used for calls to
1032
+ * IceProxy::Ice::LoggerAdmin::begin_getLog.
1033
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_getLog.
1034
+ */
575
1035
  class Callback_LoggerAdmin_getLog_Base : public virtual ::IceInternal::CallbackBase { };
576
1036
  typedef ::IceUtil::Handle< Callback_LoggerAdmin_getLog_Base> Callback_LoggerAdmin_getLogPtr;
577
1037
 
@@ -587,37 +1047,88 @@ class ICE_CLASS(ICE_API) RemoteLogger : public virtual ::Ice::Proxy<RemoteLogger
587
1047
  {
588
1048
  public:
589
1049
 
590
- ICE_MEMBER(ICE_API) void init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context = ::Ice::noExplicitContext)
591
- {
592
- end_init(_iceI_begin_init(iceP_prefix, iceP_logMessages, context, ::IceInternal::dummyCallback, 0, true));
593
- }
594
-
595
- ::Ice::AsyncResultPtr begin_init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context = ::Ice::noExplicitContext)
596
- {
597
- return _iceI_begin_init(iceP_prefix, iceP_logMessages, context, ::IceInternal::dummyCallback, 0);
598
- }
599
-
600
- ::Ice::AsyncResultPtr begin_init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
601
- {
602
- return _iceI_begin_init(iceP_prefix, iceP_logMessages, ::Ice::noExplicitContext, del, cookie);
603
- }
604
-
605
- ::Ice::AsyncResultPtr begin_init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
606
- {
607
- return _iceI_begin_init(iceP_prefix, iceP_logMessages, context, del, cookie);
608
- }
609
-
610
- ::Ice::AsyncResultPtr begin_init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Callback_RemoteLogger_initPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
611
- {
612
- return _iceI_begin_init(iceP_prefix, iceP_logMessages, ::Ice::noExplicitContext, del, cookie);
613
- }
614
-
615
- ::Ice::AsyncResultPtr begin_init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context, const ::Ice::Callback_RemoteLogger_initPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
616
- {
617
- return _iceI_begin_init(iceP_prefix, iceP_logMessages, context, del, cookie);
618
- }
619
-
620
- ICE_MEMBER(ICE_API) void end_init(const ::Ice::AsyncResultPtr&);
1050
+ /**
1051
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
1052
+ * @param prefix The prefix of the associated local Logger.
1053
+ * @param logMessages Old log messages generated before "now".
1054
+ * @param context The Context map to send with the invocation.
1055
+ */
1056
+ ICE_MEMBER(ICE_API) void init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::Context& context = ::Ice::noExplicitContext)
1057
+ {
1058
+ end_init(_iceI_begin_init(prefix, logMessages, context, ::IceInternal::dummyCallback, 0, true));
1059
+ }
1060
+
1061
+ /**
1062
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
1063
+ * @param prefix The prefix of the associated local Logger.
1064
+ * @param logMessages Old log messages generated before "now".
1065
+ * @param context The Context map to send with the invocation.
1066
+ * @return The asynchronous result object for the invocation.
1067
+ */
1068
+ ::Ice::AsyncResultPtr begin_init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::Context& context = ::Ice::noExplicitContext)
1069
+ {
1070
+ return _iceI_begin_init(prefix, logMessages, context, ::IceInternal::dummyCallback, 0);
1071
+ }
1072
+
1073
+ /**
1074
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
1075
+ * @param prefix The prefix of the associated local Logger.
1076
+ * @param logMessages Old log messages generated before "now".
1077
+ * @param cb Asynchronous callback object.
1078
+ * @param cookie User-defined data to associate with the invocation.
1079
+ * @return The asynchronous result object for the invocation.
1080
+ */
1081
+ ::Ice::AsyncResultPtr begin_init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1082
+ {
1083
+ return _iceI_begin_init(prefix, logMessages, ::Ice::noExplicitContext, cb, cookie);
1084
+ }
1085
+
1086
+ /**
1087
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
1088
+ * @param prefix The prefix of the associated local Logger.
1089
+ * @param logMessages Old log messages generated before "now".
1090
+ * @param context The Context map to send with the invocation.
1091
+ * @param cb Asynchronous callback object.
1092
+ * @param cookie User-defined data to associate with the invocation.
1093
+ * @return The asynchronous result object for the invocation.
1094
+ */
1095
+ ::Ice::AsyncResultPtr begin_init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1096
+ {
1097
+ return _iceI_begin_init(prefix, logMessages, context, cb, cookie);
1098
+ }
1099
+
1100
+ /**
1101
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
1102
+ * @param prefix The prefix of the associated local Logger.
1103
+ * @param logMessages Old log messages generated before "now".
1104
+ * @param cb Asynchronous callback object.
1105
+ * @param cookie User-defined data to associate with the invocation.
1106
+ * @return The asynchronous result object for the invocation.
1107
+ */
1108
+ ::Ice::AsyncResultPtr begin_init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::Callback_RemoteLogger_initPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1109
+ {
1110
+ return _iceI_begin_init(prefix, logMessages, ::Ice::noExplicitContext, cb, cookie);
1111
+ }
1112
+
1113
+ /**
1114
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
1115
+ * @param prefix The prefix of the associated local Logger.
1116
+ * @param logMessages Old log messages generated before "now".
1117
+ * @param context The Context map to send with the invocation.
1118
+ * @param cb Asynchronous callback object.
1119
+ * @param cookie User-defined data to associate with the invocation.
1120
+ * @return The asynchronous result object for the invocation.
1121
+ */
1122
+ ::Ice::AsyncResultPtr begin_init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::Context& context, const ::Ice::Callback_RemoteLogger_initPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1123
+ {
1124
+ return _iceI_begin_init(prefix, logMessages, context, cb, cookie);
1125
+ }
1126
+
1127
+ /**
1128
+ * Completes an invocation of begin_init.
1129
+ * @param result The asynchronous result object for the invocation.
1130
+ */
1131
+ ICE_MEMBER(ICE_API) void end_init(const ::Ice::AsyncResultPtr& result);
621
1132
 
622
1133
  private:
623
1134
 
@@ -625,37 +1136,82 @@ private:
625
1136
 
626
1137
  public:
627
1138
 
628
- ICE_MEMBER(ICE_API) void log(const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context = ::Ice::noExplicitContext)
1139
+ /**
1140
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
1141
+ * @param message The message to log.
1142
+ * @param context The Context map to send with the invocation.
1143
+ */
1144
+ ICE_MEMBER(ICE_API) void log(const ::Ice::LogMessage& message, const ::Ice::Context& context = ::Ice::noExplicitContext)
629
1145
  {
630
- end_log(_iceI_begin_log(iceP_message, context, ::IceInternal::dummyCallback, 0, true));
1146
+ end_log(_iceI_begin_log(message, context, ::IceInternal::dummyCallback, 0, true));
631
1147
  }
632
1148
 
633
- ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context = ::Ice::noExplicitContext)
1149
+ /**
1150
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
1151
+ * @param message The message to log.
1152
+ * @param context The Context map to send with the invocation.
1153
+ * @return The asynchronous result object for the invocation.
1154
+ */
1155
+ ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& message, const ::Ice::Context& context = ::Ice::noExplicitContext)
634
1156
  {
635
- return _iceI_begin_log(iceP_message, context, ::IceInternal::dummyCallback, 0);
1157
+ return _iceI_begin_log(message, context, ::IceInternal::dummyCallback, 0);
636
1158
  }
637
1159
 
638
- ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& iceP_message, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1160
+ /**
1161
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
1162
+ * @param message The message to log.
1163
+ * @param cb Asynchronous callback object.
1164
+ * @param cookie User-defined data to associate with the invocation.
1165
+ * @return The asynchronous result object for the invocation.
1166
+ */
1167
+ ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& message, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
639
1168
  {
640
- return _iceI_begin_log(iceP_message, ::Ice::noExplicitContext, del, cookie);
1169
+ return _iceI_begin_log(message, ::Ice::noExplicitContext, cb, cookie);
641
1170
  }
642
1171
 
643
- ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1172
+ /**
1173
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
1174
+ * @param message The message to log.
1175
+ * @param context The Context map to send with the invocation.
1176
+ * @param cb Asynchronous callback object.
1177
+ * @param cookie User-defined data to associate with the invocation.
1178
+ * @return The asynchronous result object for the invocation.
1179
+ */
1180
+ ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& message, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
644
1181
  {
645
- return _iceI_begin_log(iceP_message, context, del, cookie);
1182
+ return _iceI_begin_log(message, context, cb, cookie);
646
1183
  }
647
1184
 
648
- ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& iceP_message, const ::Ice::Callback_RemoteLogger_logPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1185
+ /**
1186
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
1187
+ * @param message The message to log.
1188
+ * @param cb Asynchronous callback object.
1189
+ * @param cookie User-defined data to associate with the invocation.
1190
+ * @return The asynchronous result object for the invocation.
1191
+ */
1192
+ ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& message, const ::Ice::Callback_RemoteLogger_logPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
649
1193
  {
650
- return _iceI_begin_log(iceP_message, ::Ice::noExplicitContext, del, cookie);
1194
+ return _iceI_begin_log(message, ::Ice::noExplicitContext, cb, cookie);
651
1195
  }
652
1196
 
653
- ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context, const ::Ice::Callback_RemoteLogger_logPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1197
+ /**
1198
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
1199
+ * @param message The message to log.
1200
+ * @param context The Context map to send with the invocation.
1201
+ * @param cb Asynchronous callback object.
1202
+ * @param cookie User-defined data to associate with the invocation.
1203
+ * @return The asynchronous result object for the invocation.
1204
+ */
1205
+ ::Ice::AsyncResultPtr begin_log(const ::Ice::LogMessage& message, const ::Ice::Context& context, const ::Ice::Callback_RemoteLogger_logPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
654
1206
  {
655
- return _iceI_begin_log(iceP_message, context, del, cookie);
1207
+ return _iceI_begin_log(message, context, cb, cookie);
656
1208
  }
657
1209
 
658
- ICE_MEMBER(ICE_API) void end_log(const ::Ice::AsyncResultPtr&);
1210
+ /**
1211
+ * Completes an invocation of begin_log.
1212
+ * @param result The asynchronous result object for the invocation.
1213
+ */
1214
+ ICE_MEMBER(ICE_API) void end_log(const ::Ice::AsyncResultPtr& result);
659
1215
 
660
1216
  private:
661
1217
 
@@ -663,48 +1219,151 @@ private:
663
1219
 
664
1220
  public:
665
1221
 
1222
+ /**
1223
+ * Obtains the Slice type ID corresponding to this interface.
1224
+ * @return A fully-scoped type ID.
1225
+ */
666
1226
  ICE_MEMBER(ICE_API) static const ::std::string& ice_staticId();
667
1227
 
668
1228
  protected:
1229
+ /// \cond INTERNAL
669
1230
 
670
1231
  ICE_MEMBER(ICE_API) virtual ::IceProxy::Ice::Object* _newInstance() const;
1232
+ /// \endcond
671
1233
  };
672
1234
 
673
1235
  class ICE_CLASS(ICE_API) LoggerAdmin : public virtual ::Ice::Proxy<LoggerAdmin, ::IceProxy::Ice::Object>
674
1236
  {
675
1237
  public:
676
1238
 
677
- ICE_MEMBER(ICE_API) void attachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context = ::Ice::noExplicitContext)
678
- {
679
- end_attachRemoteLogger(_iceI_begin_attachRemoteLogger(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, ::IceInternal::dummyCallback, 0, true));
680
- }
681
-
682
- ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context = ::Ice::noExplicitContext)
683
- {
684
- return _iceI_begin_attachRemoteLogger(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, ::IceInternal::dummyCallback, 0);
685
- }
686
-
687
- ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
688
- {
689
- return _iceI_begin_attachRemoteLogger(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, ::Ice::noExplicitContext, del, cookie);
690
- }
691
-
692
- ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
693
- {
694
- return _iceI_begin_attachRemoteLogger(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, del, cookie);
695
- }
696
-
697
- ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Callback_LoggerAdmin_attachRemoteLoggerPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
698
- {
699
- return _iceI_begin_attachRemoteLogger(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, ::Ice::noExplicitContext, del, cookie);
700
- }
701
-
702
- ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context, const ::Ice::Callback_LoggerAdmin_attachRemoteLoggerPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
703
- {
704
- return _iceI_begin_attachRemoteLogger(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, del, cookie);
705
- }
706
-
707
- ICE_MEMBER(ICE_API) void end_attachRemoteLogger(const ::Ice::AsyncResultPtr&);
1239
+ /**
1240
+ * Attaches a RemoteLogger object to the local logger.
1241
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
1242
+ * @param prx A proxy to the remote logger.
1243
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
1244
+ * An empty list means no filtering (send all message types).
1245
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
1246
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1247
+ * An empty list means no filtering (send all trace categories).
1248
+ * @param messageMax The maximum number of log messages (of all types) to be provided
1249
+ * to init. A negative value requests all messages available.
1250
+ * @param context The Context map to send with the invocation.
1251
+ * @throws Ice::RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
1252
+ * attached to this admin object.
1253
+ */
1254
+ ICE_MEMBER(ICE_API) void attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context& context = ::Ice::noExplicitContext)
1255
+ {
1256
+ end_attachRemoteLogger(_iceI_begin_attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, context, ::IceInternal::dummyCallback, 0, true));
1257
+ }
1258
+
1259
+ /**
1260
+ * Attaches a RemoteLogger object to the local logger.
1261
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
1262
+ * @param prx A proxy to the remote logger.
1263
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
1264
+ * An empty list means no filtering (send all message types).
1265
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
1266
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1267
+ * An empty list means no filtering (send all trace categories).
1268
+ * @param messageMax The maximum number of log messages (of all types) to be provided
1269
+ * to init. A negative value requests all messages available.
1270
+ * @param context The Context map to send with the invocation.
1271
+ * @return The asynchronous result object for the invocation.
1272
+ */
1273
+ ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context& context = ::Ice::noExplicitContext)
1274
+ {
1275
+ return _iceI_begin_attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, context, ::IceInternal::dummyCallback, 0);
1276
+ }
1277
+
1278
+ /**
1279
+ * Attaches a RemoteLogger object to the local logger.
1280
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
1281
+ * @param prx A proxy to the remote logger.
1282
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
1283
+ * An empty list means no filtering (send all message types).
1284
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
1285
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1286
+ * An empty list means no filtering (send all trace categories).
1287
+ * @param messageMax The maximum number of log messages (of all types) to be provided
1288
+ * to init. A negative value requests all messages available.
1289
+ * @param cb Asynchronous callback object.
1290
+ * @param cookie User-defined data to associate with the invocation.
1291
+ * @return The asynchronous result object for the invocation.
1292
+ */
1293
+ ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1294
+ {
1295
+ return _iceI_begin_attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, ::Ice::noExplicitContext, cb, cookie);
1296
+ }
1297
+
1298
+ /**
1299
+ * Attaches a RemoteLogger object to the local logger.
1300
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
1301
+ * @param prx A proxy to the remote logger.
1302
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
1303
+ * An empty list means no filtering (send all message types).
1304
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
1305
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1306
+ * An empty list means no filtering (send all trace categories).
1307
+ * @param messageMax The maximum number of log messages (of all types) to be provided
1308
+ * to init. A negative value requests all messages available.
1309
+ * @param context The Context map to send with the invocation.
1310
+ * @param cb Asynchronous callback object.
1311
+ * @param cookie User-defined data to associate with the invocation.
1312
+ * @return The asynchronous result object for the invocation.
1313
+ */
1314
+ ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1315
+ {
1316
+ return _iceI_begin_attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, context, cb, cookie);
1317
+ }
1318
+
1319
+ /**
1320
+ * Attaches a RemoteLogger object to the local logger.
1321
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
1322
+ * @param prx A proxy to the remote logger.
1323
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
1324
+ * An empty list means no filtering (send all message types).
1325
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
1326
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1327
+ * An empty list means no filtering (send all trace categories).
1328
+ * @param messageMax The maximum number of log messages (of all types) to be provided
1329
+ * to init. A negative value requests all messages available.
1330
+ * @param cb Asynchronous callback object.
1331
+ * @param cookie User-defined data to associate with the invocation.
1332
+ * @return The asynchronous result object for the invocation.
1333
+ */
1334
+ ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Callback_LoggerAdmin_attachRemoteLoggerPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1335
+ {
1336
+ return _iceI_begin_attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, ::Ice::noExplicitContext, cb, cookie);
1337
+ }
1338
+
1339
+ /**
1340
+ * Attaches a RemoteLogger object to the local logger.
1341
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
1342
+ * @param prx A proxy to the remote logger.
1343
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
1344
+ * An empty list means no filtering (send all message types).
1345
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
1346
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1347
+ * An empty list means no filtering (send all trace categories).
1348
+ * @param messageMax The maximum number of log messages (of all types) to be provided
1349
+ * to init. A negative value requests all messages available.
1350
+ * @param context The Context map to send with the invocation.
1351
+ * @param cb Asynchronous callback object.
1352
+ * @param cookie User-defined data to associate with the invocation.
1353
+ * @return The asynchronous result object for the invocation.
1354
+ */
1355
+ ::Ice::AsyncResultPtr begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context& context, const ::Ice::Callback_LoggerAdmin_attachRemoteLoggerPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1356
+ {
1357
+ return _iceI_begin_attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, context, cb, cookie);
1358
+ }
1359
+
1360
+ /**
1361
+ * Completes an invocation of begin_attachRemoteLogger.
1362
+ * @param result The asynchronous result object for the invocation.
1363
+ * @throws Ice::RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
1364
+ * attached to this admin object.
1365
+ */
1366
+ ICE_MEMBER(ICE_API) void end_attachRemoteLogger(const ::Ice::AsyncResultPtr& result);
708
1367
 
709
1368
  private:
710
1369
 
@@ -712,37 +1371,84 @@ private:
712
1371
 
713
1372
  public:
714
1373
 
715
- ICE_MEMBER(ICE_API) bool detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
1374
+ /**
1375
+ * Detaches a RemoteLogger object from the local logger.
1376
+ * @param prx A proxy to the remote logger.
1377
+ * @param context The Context map to send with the invocation.
1378
+ * @return True if the provided remote logger proxy was detached, and false otherwise.
1379
+ */
1380
+ ICE_MEMBER(ICE_API) bool detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
716
1381
  {
717
- return end_detachRemoteLogger(_iceI_begin_detachRemoteLogger(iceP_prx, context, ::IceInternal::dummyCallback, 0, true));
1382
+ return end_detachRemoteLogger(_iceI_begin_detachRemoteLogger(prx, context, ::IceInternal::dummyCallback, 0, true));
718
1383
  }
719
1384
 
720
- ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
1385
+ /**
1386
+ * Detaches a RemoteLogger object from the local logger.
1387
+ * @param prx A proxy to the remote logger.
1388
+ * @param context The Context map to send with the invocation.
1389
+ * @return The asynchronous result object for the invocation.
1390
+ */
1391
+ ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
721
1392
  {
722
- return _iceI_begin_detachRemoteLogger(iceP_prx, context, ::IceInternal::dummyCallback, 0);
1393
+ return _iceI_begin_detachRemoteLogger(prx, context, ::IceInternal::dummyCallback, 0);
723
1394
  }
724
1395
 
725
- ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1396
+ /**
1397
+ * Detaches a RemoteLogger object from the local logger.
1398
+ * @param prx A proxy to the remote logger.
1399
+ * @param cb Asynchronous callback object.
1400
+ * @param cookie User-defined data to associate with the invocation.
1401
+ * @return The asynchronous result object for the invocation.
1402
+ */
1403
+ ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
726
1404
  {
727
- return _iceI_begin_detachRemoteLogger(iceP_prx, ::Ice::noExplicitContext, del, cookie);
1405
+ return _iceI_begin_detachRemoteLogger(prx, ::Ice::noExplicitContext, cb, cookie);
728
1406
  }
729
1407
 
730
- ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1408
+ /**
1409
+ * Detaches a RemoteLogger object from the local logger.
1410
+ * @param prx A proxy to the remote logger.
1411
+ * @param context The Context map to send with the invocation.
1412
+ * @param cb Asynchronous callback object.
1413
+ * @param cookie User-defined data to associate with the invocation.
1414
+ * @return The asynchronous result object for the invocation.
1415
+ */
1416
+ ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
731
1417
  {
732
- return _iceI_begin_detachRemoteLogger(iceP_prx, context, del, cookie);
1418
+ return _iceI_begin_detachRemoteLogger(prx, context, cb, cookie);
733
1419
  }
734
1420
 
735
- ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::Callback_LoggerAdmin_detachRemoteLoggerPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1421
+ /**
1422
+ * Detaches a RemoteLogger object from the local logger.
1423
+ * @param prx A proxy to the remote logger.
1424
+ * @param cb Asynchronous callback object.
1425
+ * @param cookie User-defined data to associate with the invocation.
1426
+ * @return The asynchronous result object for the invocation.
1427
+ */
1428
+ ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Callback_LoggerAdmin_detachRemoteLoggerPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
736
1429
  {
737
- return _iceI_begin_detachRemoteLogger(iceP_prx, ::Ice::noExplicitContext, del, cookie);
1430
+ return _iceI_begin_detachRemoteLogger(prx, ::Ice::noExplicitContext, cb, cookie);
738
1431
  }
739
1432
 
740
- ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::Context& context, const ::Ice::Callback_LoggerAdmin_detachRemoteLoggerPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
1433
+ /**
1434
+ * Detaches a RemoteLogger object from the local logger.
1435
+ * @param prx A proxy to the remote logger.
1436
+ * @param context The Context map to send with the invocation.
1437
+ * @param cb Asynchronous callback object.
1438
+ * @param cookie User-defined data to associate with the invocation.
1439
+ * @return The asynchronous result object for the invocation.
1440
+ */
1441
+ ::Ice::AsyncResultPtr begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Context& context, const ::Ice::Callback_LoggerAdmin_detachRemoteLoggerPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
741
1442
  {
742
- return _iceI_begin_detachRemoteLogger(iceP_prx, context, del, cookie);
1443
+ return _iceI_begin_detachRemoteLogger(prx, context, cb, cookie);
743
1444
  }
744
1445
 
745
- ICE_MEMBER(ICE_API) bool end_detachRemoteLogger(const ::Ice::AsyncResultPtr&);
1446
+ /**
1447
+ * Completes an invocation of begin_detachRemoteLogger.
1448
+ * @param result The asynchronous result object for the invocation.
1449
+ * @return True if the provided remote logger proxy was detached, and false otherwise.
1450
+ */
1451
+ ICE_MEMBER(ICE_API) bool end_detachRemoteLogger(const ::Ice::AsyncResultPtr& result);
746
1452
 
747
1453
  private:
748
1454
 
@@ -750,37 +1456,126 @@ private:
750
1456
 
751
1457
  public:
752
1458
 
753
- ICE_MEMBER(ICE_API) ::Ice::LogMessageSeq getLog(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, ::std::string& iceP_prefix, const ::Ice::Context& context = ::Ice::noExplicitContext)
754
- {
755
- return end_getLog(iceP_prefix, _iceI_begin_getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, ::IceInternal::dummyCallback, 0, true));
756
- }
757
-
758
- ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context = ::Ice::noExplicitContext)
759
- {
760
- return _iceI_begin_getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, ::IceInternal::dummyCallback, 0);
761
- }
762
-
763
- ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
764
- {
765
- return _iceI_begin_getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, ::Ice::noExplicitContext, del, cookie);
766
- }
767
-
768
- ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
769
- {
770
- return _iceI_begin_getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, del, cookie);
771
- }
772
-
773
- ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Callback_LoggerAdmin_getLogPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
774
- {
775
- return _iceI_begin_getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, ::Ice::noExplicitContext, del, cookie);
776
- }
777
-
778
- ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context, const ::Ice::Callback_LoggerAdmin_getLogPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
779
- {
780
- return _iceI_begin_getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context, del, cookie);
781
- }
782
-
783
- ICE_MEMBER(ICE_API) ::Ice::LogMessageSeq end_getLog(::std::string& iceP_prefix, const ::Ice::AsyncResultPtr&);
1459
+ /**
1460
+ * Retrieves log messages recently logged.
1461
+ * @param messageTypes The list of message types that the caller wishes to receive.
1462
+ * An empty list means no filtering (send all message types).
1463
+ * @param traceCategories The categories of traces that caller wish to receive.
1464
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1465
+ * An empty list means no filtering (send all trace categories).
1466
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
1467
+ * A negative value requests all messages available.
1468
+ * @param prefix The prefix of the associated local logger.
1469
+ * @param context The Context map to send with the invocation.
1470
+ * @return The Log messages.
1471
+ */
1472
+ ICE_MEMBER(ICE_API) ::Ice::LogMessageSeq getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, ::std::string& prefix, const ::Ice::Context& context = ::Ice::noExplicitContext)
1473
+ {
1474
+ return end_getLog(prefix, _iceI_begin_getLog(messageTypes, traceCategories, messageMax, context, ::IceInternal::dummyCallback, 0, true));
1475
+ }
1476
+
1477
+ /**
1478
+ * Retrieves log messages recently logged.
1479
+ * @param messageTypes The list of message types that the caller wishes to receive.
1480
+ * An empty list means no filtering (send all message types).
1481
+ * @param traceCategories The categories of traces that caller wish to receive.
1482
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1483
+ * An empty list means no filtering (send all trace categories).
1484
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
1485
+ * A negative value requests all messages available.
1486
+ * @param context The Context map to send with the invocation.
1487
+ * @return The asynchronous result object for the invocation.
1488
+ */
1489
+ ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context& context = ::Ice::noExplicitContext)
1490
+ {
1491
+ return _iceI_begin_getLog(messageTypes, traceCategories, messageMax, context, ::IceInternal::dummyCallback, 0);
1492
+ }
1493
+
1494
+ /**
1495
+ * Retrieves log messages recently logged.
1496
+ * @param messageTypes The list of message types that the caller wishes to receive.
1497
+ * An empty list means no filtering (send all message types).
1498
+ * @param traceCategories The categories of traces that caller wish to receive.
1499
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1500
+ * An empty list means no filtering (send all trace categories).
1501
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
1502
+ * A negative value requests all messages available.
1503
+ * @param cb Asynchronous callback object.
1504
+ * @param cookie User-defined data to associate with the invocation.
1505
+ * @return The asynchronous result object for the invocation.
1506
+ */
1507
+ ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1508
+ {
1509
+ return _iceI_begin_getLog(messageTypes, traceCategories, messageMax, ::Ice::noExplicitContext, cb, cookie);
1510
+ }
1511
+
1512
+ /**
1513
+ * Retrieves log messages recently logged.
1514
+ * @param messageTypes The list of message types that the caller wishes to receive.
1515
+ * An empty list means no filtering (send all message types).
1516
+ * @param traceCategories The categories of traces that caller wish to receive.
1517
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1518
+ * An empty list means no filtering (send all trace categories).
1519
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
1520
+ * A negative value requests all messages available.
1521
+ * @param context The Context map to send with the invocation.
1522
+ * @param cb Asynchronous callback object.
1523
+ * @param cookie User-defined data to associate with the invocation.
1524
+ * @return The asynchronous result object for the invocation.
1525
+ */
1526
+ ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1527
+ {
1528
+ return _iceI_begin_getLog(messageTypes, traceCategories, messageMax, context, cb, cookie);
1529
+ }
1530
+
1531
+ /**
1532
+ * Retrieves log messages recently logged.
1533
+ * @param messageTypes The list of message types that the caller wishes to receive.
1534
+ * An empty list means no filtering (send all message types).
1535
+ * @param traceCategories The categories of traces that caller wish to receive.
1536
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1537
+ * An empty list means no filtering (send all trace categories).
1538
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
1539
+ * A negative value requests all messages available.
1540
+ * @param cb Asynchronous callback object.
1541
+ * @param cookie User-defined data to associate with the invocation.
1542
+ * @return The asynchronous result object for the invocation.
1543
+ */
1544
+ ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Callback_LoggerAdmin_getLogPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1545
+ {
1546
+ return _iceI_begin_getLog(messageTypes, traceCategories, messageMax, ::Ice::noExplicitContext, cb, cookie);
1547
+ }
1548
+
1549
+ /**
1550
+ * Retrieves log messages recently logged.
1551
+ * @param messageTypes The list of message types that the caller wishes to receive.
1552
+ * An empty list means no filtering (send all message types).
1553
+ * @param traceCategories The categories of traces that caller wish to receive.
1554
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1555
+ * An empty list means no filtering (send all trace categories).
1556
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
1557
+ * A negative value requests all messages available.
1558
+ * @param context The Context map to send with the invocation.
1559
+ * @param cb Asynchronous callback object.
1560
+ * @param cookie User-defined data to associate with the invocation.
1561
+ * @return The asynchronous result object for the invocation.
1562
+ */
1563
+ ::Ice::AsyncResultPtr begin_getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context& context, const ::Ice::Callback_LoggerAdmin_getLogPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
1564
+ {
1565
+ return _iceI_begin_getLog(messageTypes, traceCategories, messageMax, context, cb, cookie);
1566
+ }
1567
+
1568
+ /**
1569
+ * Completes an invocation of begin_getLog.
1570
+ * @param prefix The prefix of the associated local logger.
1571
+ * @param result The asynchronous result object for the invocation.
1572
+ * @return The Log messages.
1573
+ */
1574
+ ICE_MEMBER(ICE_API) ::Ice::LogMessageSeq end_getLog(::std::string& prefix, const ::Ice::AsyncResultPtr& result);
1575
+ /// \cond INTERNAL
1576
+
1577
+ ICE_MEMBER(ICE_API) void _iceI_end_getLog(::std::string& iceP_prefix, ::Ice::LogMessageSeq& ret, const ::Ice::AsyncResultPtr&);
1578
+ /// \endcond
784
1579
 
785
1580
  private:
786
1581
 
@@ -788,11 +1583,17 @@ private:
788
1583
 
789
1584
  public:
790
1585
 
1586
+ /**
1587
+ * Obtains the Slice type ID corresponding to this interface.
1588
+ * @return A fully-scoped type ID.
1589
+ */
791
1590
  ICE_MEMBER(ICE_API) static const ::std::string& ice_staticId();
792
1591
 
793
1592
  protected:
1593
+ /// \cond INTERNAL
794
1594
 
795
1595
  ICE_MEMBER(ICE_API) virtual ::IceProxy::Ice::Object* _newInstance() const;
1596
+ /// \endcond
796
1597
  };
797
1598
 
798
1599
  }
@@ -802,7 +1603,13 @@ protected:
802
1603
  namespace Ice
803
1604
  {
804
1605
 
805
- class ICE_API RemoteLogger : public virtual ::Ice::Object
1606
+ /**
1607
+ * The Ice remote logger interface. An application can implement a
1608
+ * RemoteLogger to receive the log messages sent to the local {@link Logger}
1609
+ * of another Ice application.
1610
+ * \headerfile Ice/Ice.h
1611
+ */
1612
+ class ICE_API RemoteLogger : public virtual Object
806
1613
  {
807
1614
  public:
808
1615
 
@@ -811,37 +1618,85 @@ public:
811
1618
 
812
1619
  virtual ~RemoteLogger();
813
1620
 
814
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
815
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
816
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
817
-
1621
+ /**
1622
+ * Determines whether this object supports an interface with the given Slice type ID.
1623
+ * @param id The fully-scoped Slice type ID.
1624
+ * @param current The Current object for the invocation.
1625
+ * @return True if this object supports the interface, false, otherwise.
1626
+ */
1627
+ virtual bool ice_isA(const ::std::string& id, const Current& current = emptyCurrent) const;
1628
+
1629
+ /**
1630
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
1631
+ * @param current The Current object for the invocation.
1632
+ * @return A list of fully-scoped type IDs.
1633
+ */
1634
+ virtual ::std::vector< ::std::string> ice_ids(const Current& current = emptyCurrent) const;
1635
+
1636
+ /**
1637
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
1638
+ * @param current The Current object for the invocation.
1639
+ * @return A fully-scoped type ID.
1640
+ */
1641
+ virtual const ::std::string& ice_id(const Current& current = emptyCurrent) const;
1642
+
1643
+ /**
1644
+ * Obtains the Slice type ID corresponding to this class.
1645
+ * @return A fully-scoped type ID.
1646
+ */
818
1647
  static const ::std::string& ice_staticId();
819
1648
 
820
- virtual void init(const ::std::string&, const ::Ice::LogMessageSeq&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
1649
+ /**
1650
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
1651
+ * @param prefix The prefix of the associated local Logger.
1652
+ * @param logMessages Old log messages generated before "now".
1653
+ * @param current The Current object for the invocation.
1654
+ */
1655
+ virtual void init(const ::std::string& prefix, const LogMessageSeq& logMessages, const Current& current = emptyCurrent) = 0;
1656
+ /// \cond INTERNAL
821
1657
  bool _iceD_init(::IceInternal::Incoming&, const ::Ice::Current&);
822
-
823
- virtual void log(const ::Ice::LogMessage&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
1658
+ /// \endcond
1659
+
1660
+ /**
1661
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
1662
+ * @param message The message to log.
1663
+ * @param current The Current object for the invocation.
1664
+ */
1665
+ virtual void log(const LogMessage& message, const Current& current = emptyCurrent) = 0;
1666
+ /// \cond INTERNAL
824
1667
  bool _iceD_log(::IceInternal::Incoming&, const ::Ice::Current&);
1668
+ /// \endcond
825
1669
 
826
- virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
1670
+ /// \cond INTERNAL
1671
+ virtual bool _iceDispatch(::IceInternal::Incoming&, const Current&);
1672
+ /// \endcond
827
1673
 
828
1674
  protected:
829
1675
 
830
- virtual void _iceWriteImpl(::Ice::OutputStream*) const;
831
- virtual void _iceReadImpl(::Ice::InputStream*);
1676
+ /// \cond STREAM
1677
+ virtual void _iceWriteImpl(OutputStream*) const;
1678
+ virtual void _iceReadImpl(InputStream*);
1679
+ /// \endcond
832
1680
  };
833
1681
 
1682
+ /// \cond INTERNAL
834
1683
  inline bool operator==(const RemoteLogger& lhs, const RemoteLogger& rhs)
835
1684
  {
836
- return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
1685
+ return static_cast<const Object&>(lhs) == static_cast<const Object&>(rhs);
837
1686
  }
838
1687
 
839
1688
  inline bool operator<(const RemoteLogger& lhs, const RemoteLogger& rhs)
840
1689
  {
841
- return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
1690
+ return static_cast<const Object&>(lhs) < static_cast<const Object&>(rhs);
842
1691
  }
1692
+ /// \endcond
843
1693
 
844
- class ICE_API LoggerAdmin : public virtual ::Ice::Object
1694
+ /**
1695
+ * The interface of the admin object that allows an Ice application the attach its
1696
+ * {@link RemoteLogger} to the {@link Logger} of this admin object's Ice communicator.
1697
+ * \headerfile Ice/Ice.h
1698
+ */
1699
+ class ICE_API LoggerAdmin : public virtual Object
845
1700
  {
846
1701
  public:
847
1702
 
@@ -850,41 +1705,110 @@ public:
850
1705
 
851
1706
  virtual ~LoggerAdmin();
852
1707
 
853
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
854
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
855
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
856
-
1708
+ /**
1709
+ * Determines whether this object supports an interface with the given Slice type ID.
1710
+ * @param id The fully-scoped Slice type ID.
1711
+ * @param current The Current object for the invocation.
1712
+ * @return True if this object supports the interface, false, otherwise.
1713
+ */
1714
+ virtual bool ice_isA(const ::std::string& id, const Current& current = emptyCurrent) const;
1715
+
1716
+ /**
1717
+ * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
1718
+ * @param current The Current object for the invocation.
1719
+ * @return A list of fully-scoped type IDs.
1720
+ */
1721
+ virtual ::std::vector< ::std::string> ice_ids(const Current& current = emptyCurrent) const;
1722
+
1723
+ /**
1724
+ * Obtains a Slice type ID representing the most-derived interface supported by this object.
1725
+ * @param current The Current object for the invocation.
1726
+ * @return A fully-scoped type ID.
1727
+ */
1728
+ virtual const ::std::string& ice_id(const Current& current = emptyCurrent) const;
1729
+
1730
+ /**
1731
+ * Obtains the Slice type ID corresponding to this class.
1732
+ * @return A fully-scoped type ID.
1733
+ */
857
1734
  static const ::std::string& ice_staticId();
858
1735
 
859
- virtual void attachRemoteLogger(const ::Ice::RemoteLoggerPrx&, const ::Ice::LogMessageTypeSeq&, const ::Ice::StringSeq&, ::Ice::Int, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
1736
+ /**
1737
+ * Attaches a RemoteLogger object to the local logger.
1738
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
1739
+ * @param prx A proxy to the remote logger.
1740
+ * @param messageTypes The list of message types that the remote logger wishes to receive.
1741
+ * An empty list means no filtering (send all message types).
1742
+ * @param traceCategories The categories of traces that the remote logger wishes to receive.
1743
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1744
+ * An empty list means no filtering (send all trace categories).
1745
+ * @param messageMax The maximum number of log messages (of all types) to be provided
1746
+ * to init. A negative value requests all messages available.
1747
+ * @param current The Current object for the invocation.
1748
+ * @throws Ice::RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
1749
+ * attached to this admin object.
1750
+ */
1751
+ virtual void attachRemoteLogger(const RemoteLoggerPrx& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, Int messageMax, const Current& current = emptyCurrent) = 0;
1752
+ /// \cond INTERNAL
860
1753
  bool _iceD_attachRemoteLogger(::IceInternal::Incoming&, const ::Ice::Current&);
861
-
862
- virtual bool detachRemoteLogger(const ::Ice::RemoteLoggerPrx&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
1754
+ /// \endcond
1755
+
1756
+ /**
1757
+ * Detaches a RemoteLogger object from the local logger.
1758
+ * @param prx A proxy to the remote logger.
1759
+ * @param current The Current object for the invocation.
1760
+ * @return True if the provided remote logger proxy was detached, and false otherwise.
1761
+ */
1762
+ virtual bool detachRemoteLogger(const RemoteLoggerPrx& prx, const Current& current = emptyCurrent) = 0;
1763
+ /// \cond INTERNAL
863
1764
  bool _iceD_detachRemoteLogger(::IceInternal::Incoming&, const ::Ice::Current&);
864
-
865
- virtual ::Ice::LogMessageSeq getLog(const ::Ice::LogMessageTypeSeq&, const ::Ice::StringSeq&, ::Ice::Int, ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
1765
+ /// \endcond
1766
+
1767
+ /**
1768
+ * Retrieves log messages recently logged.
1769
+ * @param messageTypes The list of message types that the caller wishes to receive.
1770
+ * An empty list means no filtering (send all message types).
1771
+ * @param traceCategories The categories of traces that caller wish to receive.
1772
+ * This parameter is ignored if messageTypes is not empty and does not include trace.
1773
+ * An empty list means no filtering (send all trace categories).
1774
+ * @param messageMax The maximum number of log messages (of all types) to be returned.
1775
+ * A negative value requests all messages available.
1776
+ * @param prefix The prefix of the associated local logger.
1777
+ * @param current The Current object for the invocation.
1778
+ * @return The Log messages.
1779
+ */
1780
+ virtual LogMessageSeq getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, Int messageMax, ::std::string& prefix, const Current& current = emptyCurrent) = 0;
1781
+ /// \cond INTERNAL
866
1782
  bool _iceD_getLog(::IceInternal::Incoming&, const ::Ice::Current&);
1783
+ /// \endcond
867
1784
 
868
- virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
1785
+ /// \cond INTERNAL
1786
+ virtual bool _iceDispatch(::IceInternal::Incoming&, const Current&);
1787
+ /// \endcond
869
1788
 
870
1789
  protected:
871
1790
 
872
- virtual void _iceWriteImpl(::Ice::OutputStream*) const;
873
- virtual void _iceReadImpl(::Ice::InputStream*);
1791
+ /// \cond STREAM
1792
+ virtual void _iceWriteImpl(OutputStream*) const;
1793
+ virtual void _iceReadImpl(InputStream*);
1794
+ /// \endcond
874
1795
  };
875
1796
 
1797
+ /// \cond INTERNAL
876
1798
  inline bool operator==(const LoggerAdmin& lhs, const LoggerAdmin& rhs)
877
1799
  {
878
- return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
1800
+ return static_cast<const Object&>(lhs) == static_cast<const Object&>(rhs);
879
1801
  }
880
1802
 
881
1803
  inline bool operator<(const LoggerAdmin& lhs, const LoggerAdmin& rhs)
882
1804
  {
883
- return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
1805
+ return static_cast<const Object&>(lhs) < static_cast<const Object&>(rhs);
884
1806
  }
1807
+ /// \endcond
885
1808
 
886
1809
  }
887
1810
 
1811
+ /// \cond STREAM
888
1812
  namespace Ice
889
1813
  {
890
1814
 
@@ -937,10 +1861,16 @@ struct StreamableTraits< ::Ice::RemoteLoggerAlreadyAttachedException>
937
1861
  };
938
1862
 
939
1863
  }
1864
+ /// \endcond
940
1865
 
941
1866
  namespace Ice
942
1867
  {
943
1868
 
1869
+ /**
1870
+ * Type-safe asynchronous callback wrapper class used for calls to
1871
+ * IceProxy::Ice::RemoteLogger::begin_init.
1872
+ * Create a wrapper instance by calling ::Ice::newCallback_RemoteLogger_init.
1873
+ */
944
1874
  template<class T>
945
1875
  class CallbackNC_RemoteLogger_init : public Callback_RemoteLogger_init_Base, public ::IceInternal::OnewayCallbackNC<T>
946
1876
  {
@@ -958,30 +1888,65 @@ public:
958
1888
  }
959
1889
  };
960
1890
 
1891
+ /**
1892
+ * Creates a callback wrapper instance that delegates to your object.
1893
+ * @param instance The callback object.
1894
+ * @param cb The success method of the callback object.
1895
+ * @param excb The exception method of the callback object.
1896
+ * @param sentcb The sent method of the callback object.
1897
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
1898
+ */
961
1899
  template<class T> Callback_RemoteLogger_initPtr
962
1900
  newCallback_RemoteLogger_init(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
963
1901
  {
964
1902
  return new CallbackNC_RemoteLogger_init<T>(instance, cb, excb, sentcb);
965
1903
  }
966
1904
 
1905
+ /**
1906
+ * Creates a callback wrapper instance that delegates to your object.
1907
+ * @param instance The callback object.
1908
+ * @param excb The exception method of the callback object.
1909
+ * @param sentcb The sent method of the callback object.
1910
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
1911
+ */
967
1912
  template<class T> Callback_RemoteLogger_initPtr
968
1913
  newCallback_RemoteLogger_init(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
969
1914
  {
970
1915
  return new CallbackNC_RemoteLogger_init<T>(instance, 0, excb, sentcb);
971
1916
  }
972
1917
 
1918
+ /**
1919
+ * Creates a callback wrapper instance that delegates to your object.
1920
+ * @param instance The callback object.
1921
+ * @param cb The success method of the callback object.
1922
+ * @param excb The exception method of the callback object.
1923
+ * @param sentcb The sent method of the callback object.
1924
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
1925
+ */
973
1926
  template<class T> Callback_RemoteLogger_initPtr
974
1927
  newCallback_RemoteLogger_init(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
975
1928
  {
976
1929
  return new CallbackNC_RemoteLogger_init<T>(instance, cb, excb, sentcb);
977
1930
  }
978
1931
 
1932
+ /**
1933
+ * Creates a callback wrapper instance that delegates to your object.
1934
+ * @param instance The callback object.
1935
+ * @param excb The exception method of the callback object.
1936
+ * @param sentcb The sent method of the callback object.
1937
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
1938
+ */
979
1939
  template<class T> Callback_RemoteLogger_initPtr
980
1940
  newCallback_RemoteLogger_init(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
981
1941
  {
982
1942
  return new CallbackNC_RemoteLogger_init<T>(instance, 0, excb, sentcb);
983
1943
  }
984
1944
 
1945
+ /**
1946
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
1947
+ * IceProxy::Ice::RemoteLogger::begin_init.
1948
+ * Create a wrapper instance by calling ::Ice::newCallback_RemoteLogger_init.
1949
+ */
985
1950
  template<class T, typename CT>
986
1951
  class Callback_RemoteLogger_init : public Callback_RemoteLogger_init_Base, public ::IceInternal::OnewayCallback<T, CT>
987
1952
  {
@@ -999,30 +1964,69 @@ public:
999
1964
  }
1000
1965
  };
1001
1966
 
1967
+ /**
1968
+ * Creates a callback wrapper instance that delegates to your object.
1969
+ * Use this overload when your callback methods receive a cookie value.
1970
+ * @param instance The callback object.
1971
+ * @param cb The success method of the callback object.
1972
+ * @param excb The exception method of the callback object.
1973
+ * @param sentcb The sent method of the callback object.
1974
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
1975
+ */
1002
1976
  template<class T, typename CT> Callback_RemoteLogger_initPtr
1003
1977
  newCallback_RemoteLogger_init(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)
1004
1978
  {
1005
1979
  return new Callback_RemoteLogger_init<T, CT>(instance, cb, excb, sentcb);
1006
1980
  }
1007
1981
 
1982
+ /**
1983
+ * Creates a callback wrapper instance that delegates to your object.
1984
+ * Use this overload when your callback methods receive a cookie value.
1985
+ * @param instance The callback object.
1986
+ * @param excb The exception method of the callback object.
1987
+ * @param sentcb The sent method of the callback object.
1988
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
1989
+ */
1008
1990
  template<class T, typename CT> Callback_RemoteLogger_initPtr
1009
1991
  newCallback_RemoteLogger_init(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1010
1992
  {
1011
1993
  return new Callback_RemoteLogger_init<T, CT>(instance, 0, excb, sentcb);
1012
1994
  }
1013
1995
 
1996
+ /**
1997
+ * Creates a callback wrapper instance that delegates to your object.
1998
+ * Use this overload when your callback methods receive a cookie value.
1999
+ * @param instance The callback object.
2000
+ * @param cb The success method of the callback object.
2001
+ * @param excb The exception method of the callback object.
2002
+ * @param sentcb The sent method of the callback object.
2003
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
2004
+ */
1014
2005
  template<class T, typename CT> Callback_RemoteLogger_initPtr
1015
2006
  newCallback_RemoteLogger_init(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1016
2007
  {
1017
2008
  return new Callback_RemoteLogger_init<T, CT>(instance, cb, excb, sentcb);
1018
2009
  }
1019
2010
 
2011
+ /**
2012
+ * Creates a callback wrapper instance that delegates to your object.
2013
+ * Use this overload when your callback methods receive a cookie value.
2014
+ * @param instance The callback object.
2015
+ * @param excb The exception method of the callback object.
2016
+ * @param sentcb The sent method of the callback object.
2017
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_init.
2018
+ */
1020
2019
  template<class T, typename CT> Callback_RemoteLogger_initPtr
1021
2020
  newCallback_RemoteLogger_init(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1022
2021
  {
1023
2022
  return new Callback_RemoteLogger_init<T, CT>(instance, 0, excb, sentcb);
1024
2023
  }
1025
2024
 
2025
+ /**
2026
+ * Type-safe asynchronous callback wrapper class used for calls to
2027
+ * IceProxy::Ice::RemoteLogger::begin_log.
2028
+ * Create a wrapper instance by calling ::Ice::newCallback_RemoteLogger_log.
2029
+ */
1026
2030
  template<class T>
1027
2031
  class CallbackNC_RemoteLogger_log : public Callback_RemoteLogger_log_Base, public ::IceInternal::OnewayCallbackNC<T>
1028
2032
  {
@@ -1040,30 +2044,65 @@ public:
1040
2044
  }
1041
2045
  };
1042
2046
 
2047
+ /**
2048
+ * Creates a callback wrapper instance that delegates to your object.
2049
+ * @param instance The callback object.
2050
+ * @param cb The success method of the callback object.
2051
+ * @param excb The exception method of the callback object.
2052
+ * @param sentcb The sent method of the callback object.
2053
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2054
+ */
1043
2055
  template<class T> Callback_RemoteLogger_logPtr
1044
2056
  newCallback_RemoteLogger_log(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1045
2057
  {
1046
2058
  return new CallbackNC_RemoteLogger_log<T>(instance, cb, excb, sentcb);
1047
2059
  }
1048
2060
 
2061
+ /**
2062
+ * Creates a callback wrapper instance that delegates to your object.
2063
+ * @param instance The callback object.
2064
+ * @param excb The exception method of the callback object.
2065
+ * @param sentcb The sent method of the callback object.
2066
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2067
+ */
1049
2068
  template<class T> Callback_RemoteLogger_logPtr
1050
2069
  newCallback_RemoteLogger_log(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1051
2070
  {
1052
2071
  return new CallbackNC_RemoteLogger_log<T>(instance, 0, excb, sentcb);
1053
2072
  }
1054
2073
 
2074
+ /**
2075
+ * Creates a callback wrapper instance that delegates to your object.
2076
+ * @param instance The callback object.
2077
+ * @param cb The success method of the callback object.
2078
+ * @param excb The exception method of the callback object.
2079
+ * @param sentcb The sent method of the callback object.
2080
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2081
+ */
1055
2082
  template<class T> Callback_RemoteLogger_logPtr
1056
2083
  newCallback_RemoteLogger_log(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1057
2084
  {
1058
2085
  return new CallbackNC_RemoteLogger_log<T>(instance, cb, excb, sentcb);
1059
2086
  }
1060
2087
 
2088
+ /**
2089
+ * Creates a callback wrapper instance that delegates to your object.
2090
+ * @param instance The callback object.
2091
+ * @param excb The exception method of the callback object.
2092
+ * @param sentcb The sent method of the callback object.
2093
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2094
+ */
1061
2095
  template<class T> Callback_RemoteLogger_logPtr
1062
2096
  newCallback_RemoteLogger_log(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1063
2097
  {
1064
2098
  return new CallbackNC_RemoteLogger_log<T>(instance, 0, excb, sentcb);
1065
2099
  }
1066
2100
 
2101
+ /**
2102
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
2103
+ * IceProxy::Ice::RemoteLogger::begin_log.
2104
+ * Create a wrapper instance by calling ::Ice::newCallback_RemoteLogger_log.
2105
+ */
1067
2106
  template<class T, typename CT>
1068
2107
  class Callback_RemoteLogger_log : public Callback_RemoteLogger_log_Base, public ::IceInternal::OnewayCallback<T, CT>
1069
2108
  {
@@ -1081,30 +2120,69 @@ public:
1081
2120
  }
1082
2121
  };
1083
2122
 
2123
+ /**
2124
+ * Creates a callback wrapper instance that delegates to your object.
2125
+ * Use this overload when your callback methods receive a cookie value.
2126
+ * @param instance The callback object.
2127
+ * @param cb The success method of the callback object.
2128
+ * @param excb The exception method of the callback object.
2129
+ * @param sentcb The sent method of the callback object.
2130
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2131
+ */
1084
2132
  template<class T, typename CT> Callback_RemoteLogger_logPtr
1085
2133
  newCallback_RemoteLogger_log(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)
1086
2134
  {
1087
2135
  return new Callback_RemoteLogger_log<T, CT>(instance, cb, excb, sentcb);
1088
2136
  }
1089
2137
 
2138
+ /**
2139
+ * Creates a callback wrapper instance that delegates to your object.
2140
+ * Use this overload when your callback methods receive a cookie value.
2141
+ * @param instance The callback object.
2142
+ * @param excb The exception method of the callback object.
2143
+ * @param sentcb The sent method of the callback object.
2144
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2145
+ */
1090
2146
  template<class T, typename CT> Callback_RemoteLogger_logPtr
1091
2147
  newCallback_RemoteLogger_log(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1092
2148
  {
1093
2149
  return new Callback_RemoteLogger_log<T, CT>(instance, 0, excb, sentcb);
1094
2150
  }
1095
2151
 
2152
+ /**
2153
+ * Creates a callback wrapper instance that delegates to your object.
2154
+ * Use this overload when your callback methods receive a cookie value.
2155
+ * @param instance The callback object.
2156
+ * @param cb The success method of the callback object.
2157
+ * @param excb The exception method of the callback object.
2158
+ * @param sentcb The sent method of the callback object.
2159
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2160
+ */
1096
2161
  template<class T, typename CT> Callback_RemoteLogger_logPtr
1097
2162
  newCallback_RemoteLogger_log(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1098
2163
  {
1099
2164
  return new Callback_RemoteLogger_log<T, CT>(instance, cb, excb, sentcb);
1100
2165
  }
1101
2166
 
2167
+ /**
2168
+ * Creates a callback wrapper instance that delegates to your object.
2169
+ * Use this overload when your callback methods receive a cookie value.
2170
+ * @param instance The callback object.
2171
+ * @param excb The exception method of the callback object.
2172
+ * @param sentcb The sent method of the callback object.
2173
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::RemoteLogger::begin_log.
2174
+ */
1102
2175
  template<class T, typename CT> Callback_RemoteLogger_logPtr
1103
2176
  newCallback_RemoteLogger_log(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1104
2177
  {
1105
2178
  return new Callback_RemoteLogger_log<T, CT>(instance, 0, excb, sentcb);
1106
2179
  }
1107
2180
 
2181
+ /**
2182
+ * Type-safe asynchronous callback wrapper class used for calls to
2183
+ * IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2184
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_attachRemoteLogger.
2185
+ */
1108
2186
  template<class T>
1109
2187
  class CallbackNC_LoggerAdmin_attachRemoteLogger : public Callback_LoggerAdmin_attachRemoteLogger_Base, public ::IceInternal::TwowayCallbackNC<T>
1110
2188
  {
@@ -1121,9 +2199,10 @@ public:
1121
2199
  {
1122
2200
  }
1123
2201
 
1124
- virtual void completed(const ::Ice::AsyncResultPtr& result) const
2202
+ /// \cond INTERNAL
2203
+ virtual void completed(const AsyncResultPtr& result) const
1125
2204
  {
1126
- ::Ice::LoggerAdminPrx proxy = ::Ice::LoggerAdminPrx::uncheckedCast(result->getProxy());
2205
+ LoggerAdminPrx proxy = LoggerAdminPrx::uncheckedCast(result->getProxy());
1127
2206
  try
1128
2207
  {
1129
2208
  proxy->end_attachRemoteLogger(result);
@@ -1138,36 +2217,72 @@ public:
1138
2217
  (::IceInternal::CallbackNC<T>::_callback.get()->*_response)();
1139
2218
  }
1140
2219
  }
2220
+ /// \endcond
1141
2221
 
1142
2222
  private:
1143
2223
 
1144
2224
  Response _response;
1145
2225
  };
1146
2226
 
2227
+ /**
2228
+ * Creates a callback wrapper instance that delegates to your object.
2229
+ * @param instance The callback object.
2230
+ * @param cb The success method of the callback object.
2231
+ * @param excb The exception method of the callback object.
2232
+ * @param sentcb The sent method of the callback object.
2233
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2234
+ */
1147
2235
  template<class T> Callback_LoggerAdmin_attachRemoteLoggerPtr
1148
2236
  newCallback_LoggerAdmin_attachRemoteLogger(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1149
2237
  {
1150
2238
  return new CallbackNC_LoggerAdmin_attachRemoteLogger<T>(instance, cb, excb, sentcb);
1151
2239
  }
1152
2240
 
2241
+ /**
2242
+ * Creates a callback wrapper instance that delegates to your object.
2243
+ * @param instance The callback object.
2244
+ * @param excb The exception method of the callback object.
2245
+ * @param sentcb The sent method of the callback object.
2246
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2247
+ */
1153
2248
  template<class T> Callback_LoggerAdmin_attachRemoteLoggerPtr
1154
2249
  newCallback_LoggerAdmin_attachRemoteLogger(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1155
2250
  {
1156
2251
  return new CallbackNC_LoggerAdmin_attachRemoteLogger<T>(instance, 0, excb, sentcb);
1157
2252
  }
1158
2253
 
2254
+ /**
2255
+ * Creates a callback wrapper instance that delegates to your object.
2256
+ * @param instance The callback object.
2257
+ * @param cb The success method of the callback object.
2258
+ * @param excb The exception method of the callback object.
2259
+ * @param sentcb The sent method of the callback object.
2260
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2261
+ */
1159
2262
  template<class T> Callback_LoggerAdmin_attachRemoteLoggerPtr
1160
2263
  newCallback_LoggerAdmin_attachRemoteLogger(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1161
2264
  {
1162
2265
  return new CallbackNC_LoggerAdmin_attachRemoteLogger<T>(instance, cb, excb, sentcb);
1163
2266
  }
1164
2267
 
2268
+ /**
2269
+ * Creates a callback wrapper instance that delegates to your object.
2270
+ * @param instance The callback object.
2271
+ * @param excb The exception method of the callback object.
2272
+ * @param sentcb The sent method of the callback object.
2273
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2274
+ */
1165
2275
  template<class T> Callback_LoggerAdmin_attachRemoteLoggerPtr
1166
2276
  newCallback_LoggerAdmin_attachRemoteLogger(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1167
2277
  {
1168
2278
  return new CallbackNC_LoggerAdmin_attachRemoteLogger<T>(instance, 0, excb, sentcb);
1169
2279
  }
1170
2280
 
2281
+ /**
2282
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
2283
+ * IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2284
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_attachRemoteLogger.
2285
+ */
1171
2286
  template<class T, typename CT>
1172
2287
  class Callback_LoggerAdmin_attachRemoteLogger : public Callback_LoggerAdmin_attachRemoteLogger_Base, public ::IceInternal::TwowayCallback<T, CT>
1173
2288
  {
@@ -1184,9 +2299,10 @@ public:
1184
2299
  {
1185
2300
  }
1186
2301
 
1187
- virtual void completed(const ::Ice::AsyncResultPtr& result) const
2302
+ /// \cond INTERNAL
2303
+ virtual void completed(const AsyncResultPtr& result) const
1188
2304
  {
1189
- ::Ice::LoggerAdminPrx proxy = ::Ice::LoggerAdminPrx::uncheckedCast(result->getProxy());
2305
+ LoggerAdminPrx proxy = LoggerAdminPrx::uncheckedCast(result->getProxy());
1190
2306
  try
1191
2307
  {
1192
2308
  proxy->end_attachRemoteLogger(result);
@@ -1201,36 +2317,76 @@ public:
1201
2317
  (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(CT::dynamicCast(result->getCookie()));
1202
2318
  }
1203
2319
  }
2320
+ /// \endcond
1204
2321
 
1205
2322
  private:
1206
2323
 
1207
2324
  Response _response;
1208
2325
  };
1209
2326
 
2327
+ /**
2328
+ * Creates a callback wrapper instance that delegates to your object.
2329
+ * Use this overload when your callback methods receive a cookie value.
2330
+ * @param instance The callback object.
2331
+ * @param cb The success method of the callback object.
2332
+ * @param excb The exception method of the callback object.
2333
+ * @param sentcb The sent method of the callback object.
2334
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2335
+ */
1210
2336
  template<class T, typename CT> Callback_LoggerAdmin_attachRemoteLoggerPtr
1211
2337
  newCallback_LoggerAdmin_attachRemoteLogger(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)
1212
2338
  {
1213
2339
  return new Callback_LoggerAdmin_attachRemoteLogger<T, CT>(instance, cb, excb, sentcb);
1214
2340
  }
1215
2341
 
2342
+ /**
2343
+ * Creates a callback wrapper instance that delegates to your object.
2344
+ * Use this overload when your callback methods receive a cookie value.
2345
+ * @param instance The callback object.
2346
+ * @param excb The exception method of the callback object.
2347
+ * @param sentcb The sent method of the callback object.
2348
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2349
+ */
1216
2350
  template<class T, typename CT> Callback_LoggerAdmin_attachRemoteLoggerPtr
1217
2351
  newCallback_LoggerAdmin_attachRemoteLogger(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1218
2352
  {
1219
2353
  return new Callback_LoggerAdmin_attachRemoteLogger<T, CT>(instance, 0, excb, sentcb);
1220
2354
  }
1221
2355
 
2356
+ /**
2357
+ * Creates a callback wrapper instance that delegates to your object.
2358
+ * Use this overload when your callback methods receive a cookie value.
2359
+ * @param instance The callback object.
2360
+ * @param cb The success method of the callback object.
2361
+ * @param excb The exception method of the callback object.
2362
+ * @param sentcb The sent method of the callback object.
2363
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2364
+ */
1222
2365
  template<class T, typename CT> Callback_LoggerAdmin_attachRemoteLoggerPtr
1223
2366
  newCallback_LoggerAdmin_attachRemoteLogger(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1224
2367
  {
1225
2368
  return new Callback_LoggerAdmin_attachRemoteLogger<T, CT>(instance, cb, excb, sentcb);
1226
2369
  }
1227
2370
 
2371
+ /**
2372
+ * Creates a callback wrapper instance that delegates to your object.
2373
+ * Use this overload when your callback methods receive a cookie value.
2374
+ * @param instance The callback object.
2375
+ * @param excb The exception method of the callback object.
2376
+ * @param sentcb The sent method of the callback object.
2377
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger.
2378
+ */
1228
2379
  template<class T, typename CT> Callback_LoggerAdmin_attachRemoteLoggerPtr
1229
2380
  newCallback_LoggerAdmin_attachRemoteLogger(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1230
2381
  {
1231
2382
  return new Callback_LoggerAdmin_attachRemoteLogger<T, CT>(instance, 0, excb, sentcb);
1232
2383
  }
1233
2384
 
2385
+ /**
2386
+ * Type-safe asynchronous callback wrapper class used for calls to
2387
+ * IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger.
2388
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_detachRemoteLogger.
2389
+ */
1234
2390
  template<class T>
1235
2391
  class CallbackNC_LoggerAdmin_detachRemoteLogger : public Callback_LoggerAdmin_detachRemoteLogger_Base, public ::IceInternal::TwowayCallbackNC<T>
1236
2392
  {
@@ -1247,9 +2403,10 @@ public:
1247
2403
  {
1248
2404
  }
1249
2405
 
1250
- virtual void completed(const ::Ice::AsyncResultPtr& result) const
2406
+ /// \cond INTERNAL
2407
+ virtual void completed(const AsyncResultPtr& result) const
1251
2408
  {
1252
- ::Ice::LoggerAdminPrx proxy = ::Ice::LoggerAdminPrx::uncheckedCast(result->getProxy());
2409
+ LoggerAdminPrx proxy = LoggerAdminPrx::uncheckedCast(result->getProxy());
1253
2410
  bool ret;
1254
2411
  try
1255
2412
  {
@@ -1265,24 +2422,46 @@ public:
1265
2422
  (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret);
1266
2423
  }
1267
2424
  }
2425
+ /// \endcond
1268
2426
 
1269
2427
  private:
1270
2428
 
1271
2429
  Response _response;
1272
2430
  };
1273
2431
 
2432
+ /**
2433
+ * Creates a callback wrapper instance that delegates to your object.
2434
+ * @param instance The callback object.
2435
+ * @param cb The success method of the callback object.
2436
+ * @param excb The exception method of the callback object.
2437
+ * @param sentcb The sent method of the callback object.
2438
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger.
2439
+ */
1274
2440
  template<class T> Callback_LoggerAdmin_detachRemoteLoggerPtr
1275
2441
  newCallback_LoggerAdmin_detachRemoteLogger(const IceUtil::Handle<T>& instance, void (T::*cb)(bool), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1276
2442
  {
1277
2443
  return new CallbackNC_LoggerAdmin_detachRemoteLogger<T>(instance, cb, excb, sentcb);
1278
2444
  }
1279
2445
 
2446
+ /**
2447
+ * Creates a callback wrapper instance that delegates to your object.
2448
+ * @param instance The callback object.
2449
+ * @param cb The success method of the callback object.
2450
+ * @param excb The exception method of the callback object.
2451
+ * @param sentcb The sent method of the callback object.
2452
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger.
2453
+ */
1280
2454
  template<class T> Callback_LoggerAdmin_detachRemoteLoggerPtr
1281
2455
  newCallback_LoggerAdmin_detachRemoteLogger(T* instance, void (T::*cb)(bool), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1282
2456
  {
1283
2457
  return new CallbackNC_LoggerAdmin_detachRemoteLogger<T>(instance, cb, excb, sentcb);
1284
2458
  }
1285
2459
 
2460
+ /**
2461
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
2462
+ * IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger.
2463
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_detachRemoteLogger.
2464
+ */
1286
2465
  template<class T, typename CT>
1287
2466
  class Callback_LoggerAdmin_detachRemoteLogger : public Callback_LoggerAdmin_detachRemoteLogger_Base, public ::IceInternal::TwowayCallback<T, CT>
1288
2467
  {
@@ -1299,9 +2478,10 @@ public:
1299
2478
  {
1300
2479
  }
1301
2480
 
1302
- virtual void completed(const ::Ice::AsyncResultPtr& result) const
2481
+ /// \cond INTERNAL
2482
+ virtual void completed(const AsyncResultPtr& result) const
1303
2483
  {
1304
- ::Ice::LoggerAdminPrx proxy = ::Ice::LoggerAdminPrx::uncheckedCast(result->getProxy());
2484
+ LoggerAdminPrx proxy = LoggerAdminPrx::uncheckedCast(result->getProxy());
1305
2485
  bool ret;
1306
2486
  try
1307
2487
  {
@@ -1317,24 +2497,48 @@ public:
1317
2497
  (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret, CT::dynamicCast(result->getCookie()));
1318
2498
  }
1319
2499
  }
2500
+ /// \endcond
1320
2501
 
1321
2502
  private:
1322
2503
 
1323
2504
  Response _response;
1324
2505
  };
1325
2506
 
2507
+ /**
2508
+ * Creates a callback wrapper instance that delegates to your object.
2509
+ * Use this overload when your callback methods receive a cookie value.
2510
+ * @param instance The callback object.
2511
+ * @param cb The success method of the callback object.
2512
+ * @param excb The exception method of the callback object.
2513
+ * @param sentcb The sent method of the callback object.
2514
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger.
2515
+ */
1326
2516
  template<class T, typename CT> Callback_LoggerAdmin_detachRemoteLoggerPtr
1327
2517
  newCallback_LoggerAdmin_detachRemoteLogger(const IceUtil::Handle<T>& instance, void (T::*cb)(bool, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1328
2518
  {
1329
2519
  return new Callback_LoggerAdmin_detachRemoteLogger<T, CT>(instance, cb, excb, sentcb);
1330
2520
  }
1331
2521
 
2522
+ /**
2523
+ * Creates a callback wrapper instance that delegates to your object.
2524
+ * Use this overload when your callback methods receive a cookie value.
2525
+ * @param instance The callback object.
2526
+ * @param cb The success method of the callback object.
2527
+ * @param excb The exception method of the callback object.
2528
+ * @param sentcb The sent method of the callback object.
2529
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger.
2530
+ */
1332
2531
  template<class T, typename CT> Callback_LoggerAdmin_detachRemoteLoggerPtr
1333
2532
  newCallback_LoggerAdmin_detachRemoteLogger(T* instance, void (T::*cb)(bool, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1334
2533
  {
1335
2534
  return new Callback_LoggerAdmin_detachRemoteLogger<T, CT>(instance, cb, excb, sentcb);
1336
2535
  }
1337
2536
 
2537
+ /**
2538
+ * Type-safe asynchronous callback wrapper class used for calls to
2539
+ * IceProxy::Ice::LoggerAdmin::begin_getLog.
2540
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_getLog.
2541
+ */
1338
2542
  template<class T>
1339
2543
  class CallbackNC_LoggerAdmin_getLog : public Callback_LoggerAdmin_getLog_Base, public ::IceInternal::TwowayCallbackNC<T>
1340
2544
  {
@@ -1344,18 +2548,19 @@ public:
1344
2548
 
1345
2549
  typedef void (T::*Exception)(const ::Ice::Exception&);
1346
2550
  typedef void (T::*Sent)(bool);
1347
- typedef void (T::*Response)(const ::Ice::LogMessageSeq&, const ::std::string&);
2551
+ typedef void (T::*Response)(const LogMessageSeq&, const ::std::string&);
1348
2552
 
1349
2553
  CallbackNC_LoggerAdmin_getLog(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
1350
2554
  : ::IceInternal::TwowayCallbackNC<T>(obj, cb != 0, excb, sentcb), _response(cb)
1351
2555
  {
1352
2556
  }
1353
2557
 
1354
- virtual void completed(const ::Ice::AsyncResultPtr& result) const
2558
+ /// \cond INTERNAL
2559
+ virtual void completed(const AsyncResultPtr& result) const
1355
2560
  {
1356
- ::Ice::LoggerAdminPrx proxy = ::Ice::LoggerAdminPrx::uncheckedCast(result->getProxy());
2561
+ LoggerAdminPrx proxy = LoggerAdminPrx::uncheckedCast(result->getProxy());
1357
2562
  ::std::string iceP_prefix;
1358
- ::Ice::LogMessageSeq ret;
2563
+ LogMessageSeq ret;
1359
2564
  try
1360
2565
  {
1361
2566
  ret = proxy->end_getLog(iceP_prefix, result);
@@ -1370,24 +2575,46 @@ public:
1370
2575
  (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret, iceP_prefix);
1371
2576
  }
1372
2577
  }
2578
+ /// \endcond
1373
2579
 
1374
2580
  private:
1375
2581
 
1376
2582
  Response _response;
1377
2583
  };
1378
2584
 
2585
+ /**
2586
+ * Creates a callback wrapper instance that delegates to your object.
2587
+ * @param instance The callback object.
2588
+ * @param cb The success method of the callback object.
2589
+ * @param excb The exception method of the callback object.
2590
+ * @param sentcb The sent method of the callback object.
2591
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_getLog.
2592
+ */
1379
2593
  template<class T> Callback_LoggerAdmin_getLogPtr
1380
- newCallback_LoggerAdmin_getLog(const IceUtil::Handle<T>& instance, void (T::*cb)(const ::Ice::LogMessageSeq&, const ::std::string&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
2594
+ newCallback_LoggerAdmin_getLog(const IceUtil::Handle<T>& instance, void (T::*cb)(const LogMessageSeq&, const ::std::string&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1381
2595
  {
1382
2596
  return new CallbackNC_LoggerAdmin_getLog<T>(instance, cb, excb, sentcb);
1383
2597
  }
1384
2598
 
2599
+ /**
2600
+ * Creates a callback wrapper instance that delegates to your object.
2601
+ * @param instance The callback object.
2602
+ * @param cb The success method of the callback object.
2603
+ * @param excb The exception method of the callback object.
2604
+ * @param sentcb The sent method of the callback object.
2605
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_getLog.
2606
+ */
1385
2607
  template<class T> Callback_LoggerAdmin_getLogPtr
1386
- newCallback_LoggerAdmin_getLog(T* instance, void (T::*cb)(const ::Ice::LogMessageSeq&, const ::std::string&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
2608
+ newCallback_LoggerAdmin_getLog(T* instance, void (T::*cb)(const LogMessageSeq&, const ::std::string&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
1387
2609
  {
1388
2610
  return new CallbackNC_LoggerAdmin_getLog<T>(instance, cb, excb, sentcb);
1389
2611
  }
1390
2612
 
2613
+ /**
2614
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
2615
+ * IceProxy::Ice::LoggerAdmin::begin_getLog.
2616
+ * Create a wrapper instance by calling ::Ice::newCallback_LoggerAdmin_getLog.
2617
+ */
1391
2618
  template<class T, typename CT>
1392
2619
  class Callback_LoggerAdmin_getLog : public Callback_LoggerAdmin_getLog_Base, public ::IceInternal::TwowayCallback<T, CT>
1393
2620
  {
@@ -1397,18 +2624,19 @@ public:
1397
2624
 
1398
2625
  typedef void (T::*Exception)(const ::Ice::Exception& , const CT&);
1399
2626
  typedef void (T::*Sent)(bool , const CT&);
1400
- typedef void (T::*Response)(const ::Ice::LogMessageSeq&, const ::std::string&, const CT&);
2627
+ typedef void (T::*Response)(const LogMessageSeq&, const ::std::string&, const CT&);
1401
2628
 
1402
2629
  Callback_LoggerAdmin_getLog(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
1403
2630
  : ::IceInternal::TwowayCallback<T, CT>(obj, cb != 0, excb, sentcb), _response(cb)
1404
2631
  {
1405
2632
  }
1406
2633
 
1407
- virtual void completed(const ::Ice::AsyncResultPtr& result) const
2634
+ /// \cond INTERNAL
2635
+ virtual void completed(const AsyncResultPtr& result) const
1408
2636
  {
1409
- ::Ice::LoggerAdminPrx proxy = ::Ice::LoggerAdminPrx::uncheckedCast(result->getProxy());
2637
+ LoggerAdminPrx proxy = LoggerAdminPrx::uncheckedCast(result->getProxy());
1410
2638
  ::std::string iceP_prefix;
1411
- ::Ice::LogMessageSeq ret;
2639
+ LogMessageSeq ret;
1412
2640
  try
1413
2641
  {
1414
2642
  ret = proxy->end_getLog(iceP_prefix, result);
@@ -1423,20 +2651,39 @@ public:
1423
2651
  (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret, iceP_prefix, CT::dynamicCast(result->getCookie()));
1424
2652
  }
1425
2653
  }
2654
+ /// \endcond
1426
2655
 
1427
2656
  private:
1428
2657
 
1429
2658
  Response _response;
1430
2659
  };
1431
2660
 
2661
+ /**
2662
+ * Creates a callback wrapper instance that delegates to your object.
2663
+ * Use this overload when your callback methods receive a cookie value.
2664
+ * @param instance The callback object.
2665
+ * @param cb The success method of the callback object.
2666
+ * @param excb The exception method of the callback object.
2667
+ * @param sentcb The sent method of the callback object.
2668
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_getLog.
2669
+ */
1432
2670
  template<class T, typename CT> Callback_LoggerAdmin_getLogPtr
1433
- newCallback_LoggerAdmin_getLog(const IceUtil::Handle<T>& instance, void (T::*cb)(const ::Ice::LogMessageSeq&, const ::std::string&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
2671
+ newCallback_LoggerAdmin_getLog(const IceUtil::Handle<T>& instance, void (T::*cb)(const LogMessageSeq&, const ::std::string&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1434
2672
  {
1435
2673
  return new Callback_LoggerAdmin_getLog<T, CT>(instance, cb, excb, sentcb);
1436
2674
  }
1437
2675
 
2676
+ /**
2677
+ * Creates a callback wrapper instance that delegates to your object.
2678
+ * Use this overload when your callback methods receive a cookie value.
2679
+ * @param instance The callback object.
2680
+ * @param cb The success method of the callback object.
2681
+ * @param excb The exception method of the callback object.
2682
+ * @param sentcb The sent method of the callback object.
2683
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::LoggerAdmin::begin_getLog.
2684
+ */
1438
2685
  template<class T, typename CT> Callback_LoggerAdmin_getLogPtr
1439
- newCallback_LoggerAdmin_getLog(T* instance, void (T::*cb)(const ::Ice::LogMessageSeq&, const ::std::string&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
2686
+ newCallback_LoggerAdmin_getLog(T* instance, void (T::*cb)(const LogMessageSeq&, const ::std::string&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
1440
2687
  {
1441
2688
  return new Callback_LoggerAdmin_getLog<T, CT>(instance, cb, excb, sentcb);
1442
2689
  }