zeroc-ice 3.7.0 → 3.7.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (691) hide show
  1. checksums.yaml +5 -5
  2. data/ICE_LICENSE +1 -1
  3. data/bin/slice2rb +1 -6
  4. data/ext/Communicator.cpp +78 -10
  5. data/ext/Communicator.h +1 -6
  6. data/ext/Config.h +35 -6
  7. data/ext/Connection.cpp +22 -11
  8. data/ext/Connection.h +4 -6
  9. data/ext/Endpoint.cpp +1 -10
  10. data/ext/Endpoint.h +1 -6
  11. data/ext/ImplicitContext.cpp +1 -6
  12. data/ext/ImplicitContext.h +1 -6
  13. data/ext/Init.cpp +1 -6
  14. data/ext/Logger.cpp +1 -6
  15. data/ext/Logger.h +1 -6
  16. data/ext/Operation.cpp +6 -11
  17. data/ext/Operation.h +1 -6
  18. data/ext/Properties.cpp +3 -8
  19. data/ext/Properties.h +1 -6
  20. data/ext/Proxy.cpp +90 -14
  21. data/ext/Proxy.h +1 -6
  22. data/ext/Slice.cpp +3 -18
  23. data/ext/Slice.h +1 -6
  24. data/ext/Types.cpp +92 -60
  25. data/ext/Types.h +1 -6
  26. data/ext/Util.cpp +61 -32
  27. data/ext/Util.h +108 -33
  28. data/ext/ValueFactoryManager.cpp +2 -7
  29. data/ext/ValueFactoryManager.h +2 -7
  30. data/ext/extconf.rb +5 -3
  31. data/ext/ice/cpp/include/Ice/Application.h +234 -81
  32. data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -6
  33. data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
  34. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -7
  35. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
  36. data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
  37. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +43 -6
  38. data/ext/ice/cpp/include/Ice/Comparable.h +81 -6
  39. data/ext/ice/cpp/include/Ice/Config.h +12 -6
  40. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -6
  41. data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -6
  42. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
  43. data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
  44. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +17 -7
  45. data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -7
  46. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
  47. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
  48. data/ext/ice/cpp/include/Ice/Exception.h +57 -20
  49. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +11 -6
  50. data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -7
  51. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +2 -7
  52. data/ext/ice/cpp/include/Ice/Format.h +13 -19
  53. data/ext/ice/cpp/include/Ice/Functional.h +6 -6
  54. data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
  55. data/ext/ice/cpp/include/Ice/Handle.h +1 -6
  56. data/ext/ice/cpp/include/Ice/Ice.h +1 -6
  57. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +47 -18
  58. data/ext/ice/cpp/include/Ice/Incoming.h +27 -9
  59. data/ext/ice/cpp/include/Ice/IncomingAsync.h +47 -9
  60. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
  61. data/ext/ice/cpp/include/Ice/Initialize.h +775 -103
  62. data/ext/ice/cpp/include/Ice/InputStream.h +642 -122
  63. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
  64. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -6
  65. data/ext/ice/cpp/include/Ice/LocalObject.h +5 -6
  66. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
  67. data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -11
  68. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +11 -7
  69. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -6
  70. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +18 -7
  71. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -28
  72. data/ext/ice/cpp/include/Ice/Object.h +338 -52
  73. data/ext/ice/cpp/include/Ice/ObjectF.h +5 -6
  74. data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
  75. data/ext/ice/cpp/include/Ice/Optional.h +42 -12
  76. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +32 -8
  77. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
  78. data/ext/ice/cpp/include/Ice/OutputStream.h +441 -102
  79. data/ext/ice/cpp/include/Ice/Protocol.h +31 -6
  80. data/ext/ice/cpp/include/Ice/Proxy.h +2288 -207
  81. data/ext/ice/cpp/include/Ice/ProxyF.h +3 -6
  82. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
  83. data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -6
  84. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
  85. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -14
  86. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
  87. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
  88. data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
  89. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
  90. data/ext/ice/cpp/include/Ice/Service.h +267 -143
  91. data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
  92. data/ext/ice/cpp/include/Ice/SlicedData.h +80 -38
  93. data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -6
  94. data/ext/ice/cpp/include/Ice/StreamHelpers.h +325 -122
  95. data/ext/ice/cpp/include/Ice/StringConverter.h +32 -6
  96. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
  97. data/ext/ice/cpp/include/Ice/UUID.h +2 -6
  98. data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -7
  99. data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -7
  100. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -6
  101. data/ext/ice/cpp/include/Ice/Value.h +41 -6
  102. data/ext/ice/cpp/include/Ice/ValueF.h +3 -6
  103. data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
  104. data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
  105. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +75 -58
  106. data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -223
  107. data/ext/ice/cpp/include/IceSSL/SChannel.h +41 -35
  108. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +39 -33
  109. data/ext/ice/cpp/include/IceSSL/UWP.h +33 -29
  110. data/ext/ice/cpp/include/IceUtil/Atomic.h +2 -7
  111. data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
  112. data/ext/ice/cpp/include/IceUtil/Config.h +35 -14
  113. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +5 -10
  114. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
  115. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +52 -36
  116. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
  117. data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
  118. data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
  119. data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
  120. data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
  121. data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
  122. data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
  123. data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
  124. data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
  125. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
  126. data/ext/ice/cpp/include/IceUtil/Mutex.h +3 -13
  127. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
  128. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -6
  129. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
  130. data/ext/ice/cpp/include/IceUtil/Optional.h +103 -6
  131. data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
  132. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +18 -20
  133. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
  134. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
  135. data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
  136. data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
  137. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
  138. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +12 -9
  139. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
  140. data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
  141. data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
  142. data/ext/ice/cpp/include/IceUtil/StringConverter.h +107 -92
  143. data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
  144. data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
  145. data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
  146. data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
  147. data/ext/ice/cpp/include/IceUtil/Timer.h +5 -6
  148. data/ext/ice/cpp/include/IceUtil/UUID.h +5 -6
  149. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
  150. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +81 -26
  151. data/ext/ice/cpp/include/generated/Ice/Communicator.h +928 -136
  152. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +14 -11
  153. data/ext/ice/cpp/include/generated/Ice/Connection.h +968 -180
  154. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +22 -15
  155. data/ext/ice/cpp/include/generated/Ice/Current.h +166 -9
  156. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +476 -115
  157. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +42 -23
  158. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +30 -9
  159. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +12 -11
  160. data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -13
  161. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +151 -34
  162. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +14 -11
  163. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +630 -89
  164. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +20 -13
  165. data/ext/ice/cpp/include/generated/Ice/LocalException.h +5009 -770
  166. data/ext/ice/cpp/include/generated/Ice/Locator.h +2255 -441
  167. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +32 -19
  168. data/ext/ice/cpp/include/generated/Ice/Logger.h +105 -32
  169. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +14 -11
  170. data/ext/ice/cpp/include/generated/Ice/Metrics.h +2539 -471
  171. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1005 -132
  172. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +14 -11
  173. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +73 -18
  174. data/ext/ice/cpp/include/generated/Ice/Plugin.h +143 -34
  175. data/ext/ice/cpp/include/generated/Ice/PluginF.h +18 -13
  176. data/ext/ice/cpp/include/generated/Ice/Process.h +514 -79
  177. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +21 -14
  178. data/ext/ice/cpp/include/generated/Ice/Properties.h +307 -64
  179. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +738 -127
  180. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +25 -16
  181. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1524 -284
  182. data/ext/ice/cpp/include/generated/Ice/Router.h +1007 -201
  183. data/ext/ice/cpp/include/generated/Ice/RouterF.h +21 -14
  184. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +175 -24
  185. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +14 -11
  186. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +14 -9
  187. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +178 -29
  188. data/ext/ice/cpp/include/generated/Ice/Version.h +32 -9
  189. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +72 -21
  190. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +14 -11
  191. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +40 -15
  192. data/ext/ice/cpp/src/Ice/ACM.cpp +21 -14
  193. data/ext/ice/cpp/src/Ice/ACM.h +1 -6
  194. data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
  195. data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
  196. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
  197. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
  198. data/ext/ice/cpp/src/Ice/ArgVector.cpp +8 -13
  199. data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
  200. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
  201. data/ext/ice/cpp/src/Ice/Base64.cpp +12 -18
  202. data/ext/ice/cpp/src/Ice/Base64.h +1 -6
  203. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +2 -7
  204. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
  205. data/ext/ice/cpp/src/Ice/Buffer.cpp +3 -8
  206. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +4 -9
  207. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
  208. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
  209. data/ext/ice/cpp/src/Ice/Communicator.cpp +7 -10
  210. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +4 -9
  211. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +56 -22
  212. data/ext/ice/cpp/src/Ice/CommunicatorI.h +15 -16
  213. data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
  214. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -11
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
  216. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
  217. data/ext/ice/cpp/src/Ice/Connection.cpp +28 -17
  218. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +4 -9
  219. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +167 -52
  220. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
  221. data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
  222. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +78 -60
  223. data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -13
  224. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
  225. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
  226. data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
  227. data/ext/ice/cpp/src/Ice/Connector.h +1 -6
  228. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
  229. data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
  230. data/ext/ice/cpp/src/Ice/Current.cpp +4 -9
  231. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -12
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
  233. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
  234. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +14 -6
  235. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +7 -11
  236. data/ext/ice/cpp/src/Ice/Endpoint.cpp +25 -16
  237. data/ext/ice/cpp/src/Ice/EndpointF.cpp +4 -9
  238. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
  239. data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
  240. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +7 -18
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
  243. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
  244. data/ext/ice/cpp/src/Ice/EndpointI.cpp +2 -7
  245. data/ext/ice/cpp/src/Ice/EndpointI.h +5 -10
  246. data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
  247. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +4 -9
  248. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
  249. data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
  250. data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
  251. data/ext/ice/cpp/src/Ice/Exception.cpp +8 -13
  252. data/ext/ice/cpp/src/Ice/FacetMap.cpp +4 -9
  253. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
  254. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
  255. data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
  256. data/ext/ice/cpp/src/Ice/HashUtil.h +2 -7
  257. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
  258. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
  259. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +37 -59
  260. data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -10
  261. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
  262. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
  263. data/ext/ice/cpp/src/Ice/Identity.cpp +4 -9
  264. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +7 -10
  265. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +4 -9
  266. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +3 -20
  267. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
  268. data/ext/ice/cpp/src/Ice/Incoming.cpp +11 -13
  269. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
  270. data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
  271. data/ext/ice/cpp/src/Ice/Initialize.cpp +15 -26
  272. data/ext/ice/cpp/src/Ice/InputStream.cpp +45 -77
  273. data/ext/ice/cpp/src/Ice/Instance.cpp +70 -46
  274. data/ext/ice/cpp/src/Ice/Instance.h +3 -6
  275. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +34 -19
  276. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +4 -9
  277. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
  278. data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
  279. data/ext/ice/cpp/src/Ice/LocalException.cpp +280 -285
  280. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
  281. data/ext/ice/cpp/src/Ice/Locator.cpp +274 -166
  282. data/ext/ice/cpp/src/Ice/LocatorF.cpp +4 -9
  283. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +28 -30
  284. data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
  285. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
  286. data/ext/ice/cpp/src/Ice/Logger.cpp +7 -10
  287. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +8 -19
  288. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
  289. data/ext/ice/cpp/src/Ice/LoggerF.cpp +4 -9
  290. data/ext/ice/cpp/src/Ice/LoggerI.cpp +13 -12
  291. data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
  292. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
  293. data/ext/ice/cpp/src/Ice/Metrics.cpp +296 -113
  294. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +10 -15
  295. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
  296. data/ext/ice/cpp/src/Ice/Network.cpp +252 -271
  297. data/ext/ice/cpp/src/Ice/Network.h +6 -20
  298. data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
  299. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
  300. data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
  301. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
  302. data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
  303. data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
  304. data/ext/ice/cpp/src/Ice/Object.cpp +16 -17
  305. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +7 -10
  306. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +4 -9
  307. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -24
  308. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
  309. data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
  310. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +137 -156
  311. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +15 -16
  312. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +7 -10
  313. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
  314. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +29 -51
  315. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -7
  316. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +6 -9
  317. data/ext/ice/cpp/src/Ice/OutputStream.cpp +29 -61
  318. data/ext/ice/cpp/src/Ice/Plugin.cpp +10 -11
  319. data/ext/ice/cpp/src/Ice/PluginF.cpp +4 -9
  320. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -39
  321. data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -8
  322. data/ext/ice/cpp/src/Ice/Process.cpp +66 -42
  323. data/ext/ice/cpp/src/Ice/ProcessF.cpp +4 -9
  324. data/ext/ice/cpp/src/Ice/Properties.cpp +7 -10
  325. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +84 -54
  326. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
  327. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
  328. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +4 -9
  329. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -35
  330. data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -15
  331. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +45 -8
  332. data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
  333. data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -18
  334. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
  335. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
  336. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
  337. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
  338. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
  339. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
  340. data/ext/ice/cpp/src/Ice/Proxy.cpp +54 -8
  341. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +11 -7
  342. data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
  343. data/ext/ice/cpp/src/Ice/Reference.cpp +116 -38
  344. data/ext/ice/cpp/src/Ice/Reference.h +13 -7
  345. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +52 -98
  346. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
  347. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
  348. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +4 -8
  349. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
  350. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +194 -113
  351. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
  352. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
  353. data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
  354. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
  355. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
  356. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
  357. data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
  358. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +7 -9
  359. data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
  360. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
  361. data/ext/ice/cpp/src/Ice/Router.cpp +160 -87
  362. data/ext/ice/cpp/src/Ice/RouterF.cpp +4 -9
  363. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +8 -35
  364. data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -8
  365. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
  366. data/ext/ice/cpp/src/Ice/SHA1.cpp +3 -8
  367. data/ext/ice/cpp/src/Ice/Selector.cpp +76 -49
  368. data/ext/ice/cpp/src/Ice/Selector.h +1 -6
  369. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +7 -10
  370. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +4 -9
  371. data/ext/ice/cpp/src/Ice/ServantManager.cpp +21 -42
  372. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
  373. data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
  374. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +4 -9
  375. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
  376. data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
  377. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +46 -69
  378. data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
  379. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -6
  380. data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
  381. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
  382. data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
  383. data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
  384. data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
  385. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +13 -19
  386. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
  387. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -6
  388. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
  389. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +13 -16
  390. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -7
  391. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +6 -6
  392. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
  393. data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
  394. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +79 -19
  395. data/ext/ice/cpp/src/Ice/ThreadPool.h +11 -12
  396. data/ext/ice/cpp/src/Ice/Timer.cpp +11 -6
  397. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
  398. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
  399. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
  400. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
  401. data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
  402. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
  403. data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
  404. data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
  405. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
  406. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
  407. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +30 -33
  408. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -7
  409. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +49 -79
  410. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
  411. data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
  412. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +10 -11
  413. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -12
  414. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -7
  415. data/ext/ice/cpp/src/Ice/Version.cpp +4 -9
  416. data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
  417. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
  418. data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
  419. data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
  420. data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
  421. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +4 -10
  422. data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -7
  423. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +25 -30
  424. data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
  425. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +86 -33
  426. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1083 -129
  427. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
  428. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
  429. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
  430. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
  431. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
  432. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
  433. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +71 -30
  434. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +640 -79
  435. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
  436. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +122 -25
  437. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -9
  438. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
  439. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +4 -9
  440. data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
  441. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +7 -10
  442. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +4 -9
  443. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -9
  444. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
  445. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +9 -14
  446. data/ext/ice/cpp/src/IceSSL/EndpointI.h +3 -8
  447. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +7 -10
  448. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
  449. data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
  450. data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
  451. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +11 -19
  452. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +100 -46
  453. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -8
  454. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
  455. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
  456. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +190 -206
  457. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +2 -11
  458. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
  459. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
  460. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -6
  461. data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -6
  462. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
  463. data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
  464. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
  465. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -36
  466. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -8
  467. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
  468. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
  469. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +71 -62
  470. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
  471. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +26 -28
  472. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +3 -6
  473. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
  474. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +37 -31
  475. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
  476. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
  477. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
  478. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
  479. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +47 -27
  480. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
  481. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +41 -34
  482. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
  483. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -10
  484. data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
  485. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
  486. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
  487. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
  488. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
  489. data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
  490. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
  491. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
  492. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
  493. data/ext/ice/cpp/src/IceSSL/Util.cpp +12 -11
  494. data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
  495. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
  496. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
  497. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
  498. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
  499. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +6 -11
  500. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
  501. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
  502. data/ext/ice/cpp/src/IceUtil/Options.cpp +25 -15
  503. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +41 -16
  504. data/ext/ice/cpp/src/IceUtil/Random.cpp +3 -8
  505. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -11
  506. data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
  507. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -11
  508. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +45 -12
  509. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
  510. data/ext/ice/cpp/src/IceUtil/Time.cpp +10 -17
  511. data/ext/ice/cpp/src/IceUtil/UUID.cpp +8 -13
  512. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
  513. data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
  514. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +17 -16
  515. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +178 -170
  516. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +8 -12
  517. data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
  518. data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
  519. data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
  520. data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
  521. data/ext/ice/cpp/src/Slice/Grammar.cpp +424 -438
  522. data/ext/ice/cpp/src/Slice/Grammar.h +7 -7
  523. data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
  524. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +195 -122
  525. data/ext/ice/cpp/src/Slice/JavaUtil.h +12 -12
  526. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
  527. data/ext/ice/cpp/src/Slice/MD5.h +1 -6
  528. data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -0
  529. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +6 -6
  530. data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
  531. data/ext/ice/cpp/src/Slice/Parser.cpp +535 -266
  532. data/ext/ice/cpp/src/Slice/Parser.h +72 -12
  533. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +26 -17
  534. data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -7
  535. data/ext/ice/cpp/src/Slice/Python.cpp +28 -42
  536. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +137 -53
  537. data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -7
  538. data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
  539. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +13 -15
  540. data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
  541. data/ext/ice/cpp/src/Slice/Scanner.cpp +296 -217
  542. data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
  543. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +109 -27
  544. data/ext/ice/cpp/src/Slice/Util.h +5 -9
  545. data/ext/ice/mcpp/Makefile +2 -5
  546. data/ice.gemspec +3 -5
  547. data/lib/Glacier2.rb +1 -6
  548. data/lib/Glacier2/Metrics.rb +3 -8
  549. data/lib/Glacier2/PermissionsVerifier.rb +3 -8
  550. data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
  551. data/lib/Glacier2/Router.rb +3 -8
  552. data/lib/Glacier2/RouterF.rb +3 -8
  553. data/lib/Glacier2/SSLInfo.rb +3 -8
  554. data/lib/Glacier2/Session.rb +3 -8
  555. data/lib/Ice.rb +2 -7
  556. data/lib/Ice/BuiltinSequences.rb +3 -8
  557. data/lib/Ice/Communicator.rb +3 -8
  558. data/lib/Ice/CommunicatorF.rb +3 -8
  559. data/lib/Ice/Connection.rb +3 -8
  560. data/lib/Ice/ConnectionF.rb +3 -8
  561. data/lib/Ice/Current.rb +3 -8
  562. data/lib/Ice/Endpoint.rb +3 -8
  563. data/lib/Ice/EndpointF.rb +3 -8
  564. data/lib/Ice/EndpointTypes.rb +3 -8
  565. data/lib/Ice/FacetMap.rb +3 -8
  566. data/lib/Ice/Identity.rb +3 -8
  567. data/lib/Ice/ImplicitContext.rb +3 -8
  568. data/lib/Ice/ImplicitContextF.rb +3 -8
  569. data/lib/Ice/Instrumentation.rb +3 -8
  570. data/lib/Ice/InstrumentationF.rb +3 -8
  571. data/lib/Ice/LocalException.rb +3 -8
  572. data/lib/Ice/Locator.rb +3 -8
  573. data/lib/Ice/LocatorF.rb +3 -8
  574. data/lib/Ice/Logger.rb +3 -8
  575. data/lib/Ice/LoggerF.rb +3 -8
  576. data/lib/Ice/Metrics.rb +3 -8
  577. data/lib/Ice/ObjectAdapter.rb +3 -8
  578. data/lib/Ice/ObjectAdapterF.rb +3 -8
  579. data/lib/Ice/ObjectFactory.rb +3 -8
  580. data/lib/Ice/Plugin.rb +3 -8
  581. data/lib/Ice/PluginF.rb +3 -8
  582. data/lib/Ice/Process.rb +3 -8
  583. data/lib/Ice/ProcessF.rb +3 -8
  584. data/lib/Ice/Properties.rb +3 -8
  585. data/lib/Ice/PropertiesAdmin.rb +3 -8
  586. data/lib/Ice/PropertiesF.rb +3 -8
  587. data/lib/Ice/RemoteLogger.rb +3 -8
  588. data/lib/Ice/Router.rb +3 -8
  589. data/lib/Ice/RouterF.rb +3 -8
  590. data/lib/Ice/ServantLocator.rb +3 -8
  591. data/lib/Ice/ServantLocatorF.rb +3 -8
  592. data/lib/Ice/SliceChecksumDict.rb +3 -8
  593. data/lib/Ice/ValueFactory.rb +3 -8
  594. data/lib/Ice/Version.rb +3 -8
  595. data/lib/IceBox.rb +1 -6
  596. data/lib/IceBox/IceBox.rb +3 -8
  597. data/lib/IceGrid.rb +1 -6
  598. data/lib/IceGrid/Admin.rb +3 -8
  599. data/lib/IceGrid/Descriptor.rb +3 -8
  600. data/lib/IceGrid/Exception.rb +3 -8
  601. data/lib/IceGrid/FileParser.rb +3 -8
  602. data/lib/IceGrid/PluginFacade.rb +3 -8
  603. data/lib/IceGrid/Registry.rb +3 -8
  604. data/lib/IceGrid/Session.rb +3 -8
  605. data/lib/IceGrid/UserAccountMapper.rb +3 -8
  606. data/lib/IcePatch2.rb +1 -6
  607. data/lib/IcePatch2/FileInfo.rb +3 -8
  608. data/lib/IcePatch2/FileServer.rb +3 -8
  609. data/lib/IceStorm.rb +1 -6
  610. data/lib/IceStorm/IceStorm.rb +3 -8
  611. data/lib/IceStorm/Metrics.rb +3 -8
  612. data/slice/Glacier2/Metrics.ice +14 -8
  613. data/slice/Glacier2/PermissionsVerifier.ice +11 -7
  614. data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
  615. data/slice/Glacier2/Router.ice +12 -8
  616. data/slice/Glacier2/RouterF.ice +11 -7
  617. data/slice/Glacier2/SSLInfo.ice +11 -7
  618. data/slice/Glacier2/Session.ice +11 -7
  619. data/slice/Ice/BuiltinSequences.ice +13 -7
  620. data/slice/Ice/Communicator.ice +143 -102
  621. data/slice/Ice/CommunicatorF.ice +13 -7
  622. data/slice/Ice/Connection.ice +65 -29
  623. data/slice/Ice/ConnectionF.ice +13 -7
  624. data/slice/Ice/Current.ice +31 -26
  625. data/slice/Ice/Endpoint.ice +24 -21
  626. data/slice/Ice/EndpointF.ice +14 -8
  627. data/slice/Ice/EndpointTypes.ice +15 -9
  628. data/slice/Ice/FacetMap.ice +14 -8
  629. data/slice/Ice/Identity.ice +13 -7
  630. data/slice/Ice/ImplicitContext.ice +31 -25
  631. data/slice/Ice/ImplicitContextF.ice +12 -7
  632. data/slice/Ice/Instrumentation.ice +19 -13
  633. data/slice/Ice/InstrumentationF.ice +13 -7
  634. data/slice/Ice/LocalException.ice +35 -29
  635. data/slice/Ice/Locator.ice +14 -8
  636. data/slice/Ice/LocatorF.ice +13 -7
  637. data/slice/Ice/Logger.ice +19 -13
  638. data/slice/Ice/LoggerF.ice +13 -7
  639. data/slice/Ice/Metrics.ice +26 -18
  640. data/slice/Ice/ObjectAdapter.ice +63 -45
  641. data/slice/Ice/ObjectAdapterF.ice +13 -7
  642. data/slice/Ice/ObjectFactory.ice +20 -12
  643. data/slice/Ice/Plugin.ice +19 -10
  644. data/slice/Ice/PluginF.ice +17 -7
  645. data/slice/Ice/Process.ice +13 -7
  646. data/slice/Ice/ProcessF.ice +13 -7
  647. data/slice/Ice/Properties.ice +35 -24
  648. data/slice/Ice/PropertiesAdmin.ice +13 -7
  649. data/slice/Ice/PropertiesF.ice +13 -7
  650. data/slice/Ice/RemoteLogger.ice +23 -28
  651. data/slice/Ice/Router.ice +14 -8
  652. data/slice/Ice/RouterF.ice +13 -7
  653. data/slice/Ice/ServantLocator.ice +31 -23
  654. data/slice/Ice/ServantLocatorF.ice +13 -7
  655. data/slice/Ice/SliceChecksumDict.ice +13 -7
  656. data/slice/Ice/ValueFactory.ice +31 -26
  657. data/slice/Ice/Version.ice +13 -7
  658. data/slice/IceBT/ConnectionInfo.ice +12 -7
  659. data/slice/IceBT/EndpointInfo.ice +13 -8
  660. data/slice/IceBT/Types.ice +12 -7
  661. data/slice/IceBox/IceBox.ice +30 -11
  662. data/slice/IceDiscovery/IceDiscovery.ice +68 -7
  663. data/slice/IceGrid/Admin.ice +41 -35
  664. data/slice/IceGrid/Descriptor.ice +15 -10
  665. data/slice/IceGrid/Exception.ice +15 -10
  666. data/slice/IceGrid/FileParser.ice +14 -8
  667. data/slice/IceGrid/PluginFacade.ice +17 -11
  668. data/slice/IceGrid/Registry.ice +13 -7
  669. data/slice/IceGrid/Session.ice +18 -12
  670. data/slice/IceGrid/UserAccountMapper.ice +16 -10
  671. data/slice/IceIAP/ConnectionInfo.ice +11 -8
  672. data/slice/IceIAP/EndpointInfo.ice +11 -8
  673. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
  674. data/slice/IcePatch2/FileInfo.ice +12 -7
  675. data/slice/IcePatch2/FileServer.ice +13 -8
  676. data/slice/IceSSL/ConnectionInfo.ice +16 -9
  677. data/slice/IceSSL/ConnectionInfoF.ice +14 -8
  678. data/slice/IceSSL/EndpointInfo.ice +14 -8
  679. data/slice/IceStorm/IceStorm.ice +20 -15
  680. data/slice/IceStorm/Metrics.ice +12 -8
  681. metadata +7 -13
  682. data/BZIP2_LICENSE +0 -42
  683. data/ext/ice/bzip2/blocksort.c +0 -1094
  684. data/ext/ice/bzip2/bzlib.c +0 -1572
  685. data/ext/ice/bzip2/bzlib.h +0 -282
  686. data/ext/ice/bzip2/bzlib_private.h +0 -509
  687. data/ext/ice/bzip2/compress.c +0 -672
  688. data/ext/ice/bzip2/crctable.c +0 -104
  689. data/ext/ice/bzip2/decompress.c +0 -646
  690. data/ext/ice/bzip2/huffman.c +0 -205
  691. data/ext/ice/bzip2/randtable.c +0 -84
@@ -1,11 +1,6 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #ifndef ICE_LOGGER_I_H
11
6
  #define ICE_LOGGER_I_H
@@ -1,12 +1,7 @@
1
1
 
2
- // **********************************************************************
3
2
  //
4
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) ZeroC, Inc. All rights reserved.
5
4
  //
6
- // This copy of Ice is licensed to you under the terms described in the
7
- // ICE_LICENSE file included in this distribution.
8
- //
9
- // **********************************************************************
10
5
 
11
6
  #include <Ice/LoggerUtil.h>
12
7
  #include <Ice/Logger.h>
@@ -1,13 +1,8 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
4
  //
8
- // **********************************************************************
9
- //
10
- // Ice version 3.7.0
5
+ // Ice version 3.7.5
11
6
  //
12
7
  // <auto-generated>
13
8
  //
@@ -43,10 +38,10 @@
43
38
  # if ICE_INT_VERSION / 100 != 307
44
39
  # error Ice version mismatch!
45
40
  # endif
46
- # if ICE_INT_VERSION % 100 > 50
41
+ # if ICE_INT_VERSION % 100 >= 50
47
42
  # error Beta header file detected
48
43
  # endif
49
- # if ICE_INT_VERSION % 100 < 0
44
+ # if ICE_INT_VERSION % 100 < 5
50
45
  # error Ice patch level mismatch!
51
46
  # endif
52
47
  #endif
@@ -137,6 +132,7 @@ IceMX::MetricsAdmin::ice_staticId()
137
132
  return typeId;
138
133
  }
139
134
 
135
+ /// \cond INTERNAL
140
136
  bool
141
137
  IceMX::MetricsAdmin::_iceD_getMetricsViewNames(::IceInternal::Incoming& inS, const ::Ice::Current& current)
142
138
  {
@@ -150,7 +146,9 @@ IceMX::MetricsAdmin::_iceD_getMetricsViewNames(::IceInternal::Incoming& inS, con
150
146
  inS.endWriteParams();
151
147
  return true;
152
148
  }
149
+ /// \endcond
153
150
 
151
+ /// \cond INTERNAL
154
152
  bool
155
153
  IceMX::MetricsAdmin::_iceD_enableMetricsView(::IceInternal::Incoming& inS, const ::Ice::Current& current)
156
154
  {
@@ -164,7 +162,9 @@ IceMX::MetricsAdmin::_iceD_enableMetricsView(::IceInternal::Incoming& inS, const
164
162
  inS.writeEmptyParams();
165
163
  return true;
166
164
  }
165
+ /// \endcond
167
166
 
167
+ /// \cond INTERNAL
168
168
  bool
169
169
  IceMX::MetricsAdmin::_iceD_disableMetricsView(::IceInternal::Incoming& inS, const ::Ice::Current& current)
170
170
  {
@@ -178,7 +178,9 @@ IceMX::MetricsAdmin::_iceD_disableMetricsView(::IceInternal::Incoming& inS, cons
178
178
  inS.writeEmptyParams();
179
179
  return true;
180
180
  }
181
+ /// \endcond
181
182
 
183
+ /// \cond INTERNAL
182
184
  bool
183
185
  IceMX::MetricsAdmin::_iceD_getMetricsView(::IceInternal::Incoming& inS, const ::Ice::Current& current)
184
186
  {
@@ -189,14 +191,16 @@ IceMX::MetricsAdmin::_iceD_getMetricsView(::IceInternal::Incoming& inS, const ::
189
191
  inS.endReadParams();
190
192
  inS.setFormat(::Ice::FormatType::SlicedFormat);
191
193
  long long int iceP_timestamp;
192
- ::IceMX::MetricsView ret = this->getMetricsView(::std::move(iceP_view), iceP_timestamp, current);
194
+ MetricsView ret = this->getMetricsView(::std::move(iceP_view), iceP_timestamp, current);
193
195
  auto ostr = inS.startWriteParams();
194
196
  ostr->writeAll(iceP_timestamp, ret);
195
197
  ostr->writePendingValues();
196
198
  inS.endWriteParams();
197
199
  return true;
198
200
  }
201
+ /// \endcond
199
202
 
203
+ /// \cond INTERNAL
200
204
  bool
201
205
  IceMX::MetricsAdmin::_iceD_getMapMetricsFailures(::IceInternal::Incoming& inS, const ::Ice::Current& current)
202
206
  {
@@ -207,13 +211,15 @@ IceMX::MetricsAdmin::_iceD_getMapMetricsFailures(::IceInternal::Incoming& inS, c
207
211
  istr->readAll(iceP_view, iceP_map);
208
212
  inS.endReadParams();
209
213
  inS.setFormat(::Ice::FormatType::SlicedFormat);
210
- ::IceMX::MetricsFailuresSeq ret = this->getMapMetricsFailures(::std::move(iceP_view), ::std::move(iceP_map), current);
214
+ MetricsFailuresSeq ret = this->getMapMetricsFailures(::std::move(iceP_view), ::std::move(iceP_map), current);
211
215
  auto ostr = inS.startWriteParams();
212
216
  ostr->writeAll(ret);
213
217
  inS.endWriteParams();
214
218
  return true;
215
219
  }
220
+ /// \endcond
216
221
 
222
+ /// \cond INTERNAL
217
223
  bool
218
224
  IceMX::MetricsAdmin::_iceD_getMetricsFailures(::IceInternal::Incoming& inS, const ::Ice::Current& current)
219
225
  {
@@ -225,13 +231,15 @@ IceMX::MetricsAdmin::_iceD_getMetricsFailures(::IceInternal::Incoming& inS, cons
225
231
  istr->readAll(iceP_view, iceP_map, iceP_id);
226
232
  inS.endReadParams();
227
233
  inS.setFormat(::Ice::FormatType::SlicedFormat);
228
- ::IceMX::MetricsFailures ret = this->getMetricsFailures(::std::move(iceP_view), ::std::move(iceP_map), ::std::move(iceP_id), current);
234
+ MetricsFailures ret = this->getMetricsFailures(::std::move(iceP_view), ::std::move(iceP_map), ::std::move(iceP_id), current);
229
235
  auto ostr = inS.startWriteParams();
230
236
  ostr->writeAll(ret);
231
237
  inS.endWriteParams();
232
238
  return true;
233
239
  }
240
+ /// \endcond
234
241
 
242
+ /// \cond INTERNAL
235
243
  bool
236
244
  IceMX::MetricsAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
237
245
  {
@@ -290,6 +298,7 @@ IceMX::MetricsAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Curr
290
298
  }
291
299
  }
292
300
  }
301
+ /// \endcond
293
302
 
294
303
  IceMX::Metrics::~Metrics()
295
304
  {
@@ -379,8 +388,9 @@ IceMX::ConnectionMetrics::ice_staticId()
379
388
  return typeId;
380
389
  }
381
390
 
391
+ /// \cond INTERNAL
382
392
  void
383
- IceMX::MetricsAdminPrx::_iceI_getMetricsViewNames(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsAdmin::GetMetricsViewNamesResult>>& outAsync, const ::Ice::Context& context)
393
+ IceMX::MetricsAdminPrx::_iceI_getMetricsViewNames(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<MetricsAdmin::GetMetricsViewNamesResult>>& outAsync, const ::Ice::Context& context)
384
394
  {
385
395
  _checkTwowayOnly(iceC_IceMX_MetricsAdmin_getMetricsViewNames_name);
386
396
  outAsync->invoke(iceC_IceMX_MetricsAdmin_getMetricsViewNames_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::SlicedFormat, context,
@@ -388,12 +398,14 @@ IceMX::MetricsAdminPrx::_iceI_getMetricsViewNames(const ::std::shared_ptr<::IceI
388
398
  nullptr,
389
399
  [](::Ice::InputStream* istr)
390
400
  {
391
- ::IceMX::MetricsAdmin::GetMetricsViewNamesResult v;
401
+ MetricsAdmin::GetMetricsViewNamesResult v;
392
402
  istr->readAll(v.disabledViews, v.returnValue);
393
403
  return v;
394
404
  });
395
405
  }
406
+ /// \endcond
396
407
 
408
+ /// \cond INTERNAL
397
409
  void
398
410
  IceMX::MetricsAdminPrx::_iceI_enableMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_name, const ::Ice::Context& context)
399
411
  {
@@ -409,7 +421,7 @@ IceMX::MetricsAdminPrx::_iceI_enableMetricsView(const ::std::shared_ptr<::IceInt
409
421
  {
410
422
  ex.ice_throw();
411
423
  }
412
- catch(const ::IceMX::UnknownMetricsView&)
424
+ catch(const UnknownMetricsView&)
413
425
  {
414
426
  throw;
415
427
  }
@@ -418,7 +430,9 @@ IceMX::MetricsAdminPrx::_iceI_enableMetricsView(const ::std::shared_ptr<::IceInt
418
430
  }
419
431
  });
420
432
  }
433
+ /// \endcond
421
434
 
435
+ /// \cond INTERNAL
422
436
  void
423
437
  IceMX::MetricsAdminPrx::_iceI_disableMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_name, const ::Ice::Context& context)
424
438
  {
@@ -434,7 +448,7 @@ IceMX::MetricsAdminPrx::_iceI_disableMetricsView(const ::std::shared_ptr<::IceIn
434
448
  {
435
449
  ex.ice_throw();
436
450
  }
437
- catch(const ::IceMX::UnknownMetricsView&)
451
+ catch(const UnknownMetricsView&)
438
452
  {
439
453
  throw;
440
454
  }
@@ -443,9 +457,11 @@ IceMX::MetricsAdminPrx::_iceI_disableMetricsView(const ::std::shared_ptr<::IceIn
443
457
  }
444
458
  });
445
459
  }
460
+ /// \endcond
446
461
 
462
+ /// \cond INTERNAL
447
463
  void
448
- IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsAdmin::GetMetricsViewResult>>& outAsync, const ::std::string& iceP_view, const ::Ice::Context& context)
464
+ IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<MetricsAdmin::GetMetricsViewResult>>& outAsync, const ::std::string& iceP_view, const ::Ice::Context& context)
449
465
  {
450
466
  _checkTwowayOnly(iceC_IceMX_MetricsAdmin_getMetricsView_name);
451
467
  outAsync->invoke(iceC_IceMX_MetricsAdmin_getMetricsView_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::SlicedFormat, context,
@@ -459,7 +475,7 @@ IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceIntern
459
475
  {
460
476
  ex.ice_throw();
461
477
  }
462
- catch(const ::IceMX::UnknownMetricsView&)
478
+ catch(const UnknownMetricsView&)
463
479
  {
464
480
  throw;
465
481
  }
@@ -469,13 +485,15 @@ IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceIntern
469
485
  },
470
486
  [](::Ice::InputStream* istr)
471
487
  {
472
- ::IceMX::MetricsAdmin::GetMetricsViewResult v;
488
+ MetricsAdmin::GetMetricsViewResult v;
473
489
  istr->readAll(v.timestamp, v.returnValue);
474
490
  istr->readPendingValues();
475
491
  return v;
476
492
  });
477
493
  }
494
+ /// \endcond
478
495
 
496
+ /// \cond INTERNAL
479
497
  void
480
498
  IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsFailuresSeq>>& outAsync, const ::std::string& iceP_view, const ::std::string& iceP_map, const ::Ice::Context& context)
481
499
  {
@@ -491,7 +509,7 @@ IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures(const ::std::shared_ptr<::Ic
491
509
  {
492
510
  ex.ice_throw();
493
511
  }
494
- catch(const ::IceMX::UnknownMetricsView&)
512
+ catch(const UnknownMetricsView&)
495
513
  {
496
514
  throw;
497
515
  }
@@ -500,7 +518,9 @@ IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures(const ::std::shared_ptr<::Ic
500
518
  }
501
519
  });
502
520
  }
521
+ /// \endcond
503
522
 
523
+ /// \cond INTERNAL
504
524
  void
505
525
  IceMX::MetricsAdminPrx::_iceI_getMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsFailures>>& outAsync, const ::std::string& iceP_view, const ::std::string& iceP_map, const ::std::string& iceP_id, const ::Ice::Context& context)
506
526
  {
@@ -516,7 +536,7 @@ IceMX::MetricsAdminPrx::_iceI_getMetricsFailures(const ::std::shared_ptr<::IceIn
516
536
  {
517
537
  ex.ice_throw();
518
538
  }
519
- catch(const ::IceMX::UnknownMetricsView&)
539
+ catch(const UnknownMetricsView&)
520
540
  {
521
541
  throw;
522
542
  }
@@ -525,17 +545,20 @@ IceMX::MetricsAdminPrx::_iceI_getMetricsFailures(const ::std::shared_ptr<::IceIn
525
545
  }
526
546
  });
527
547
  }
548
+ /// \endcond
528
549
 
550
+ /// \cond INTERNAL
529
551
  ::std::shared_ptr<::Ice::ObjectPrx>
530
552
  IceMX::MetricsAdminPrx::_newInstance() const
531
553
  {
532
554
  return ::IceInternal::createProxy<MetricsAdminPrx>();
533
555
  }
556
+ /// \endcond
534
557
 
535
558
  const ::std::string&
536
559
  IceMX::MetricsAdminPrx::ice_staticId()
537
560
  {
538
- return IceMX::MetricsAdmin::ice_staticId();
561
+ return MetricsAdmin::ice_staticId();
539
562
  }
540
563
 
541
564
  namespace Ice
@@ -590,11 +613,12 @@ IceMX::UnknownMetricsView::ice_throw() const
590
613
  throw *this;
591
614
  }
592
615
 
616
+ /// \cond STREAM
593
617
  void
594
618
  IceMX::UnknownMetricsView::_writeImpl(::Ice::OutputStream* ostr) const
595
619
  {
596
620
  ostr->startSlice("::IceMX::UnknownMetricsView", -1, true);
597
- Ice::StreamWriter< ::IceMX::UnknownMetricsView, ::Ice::OutputStream>::write(ostr, *this);
621
+ ::Ice::StreamWriter< UnknownMetricsView, ::Ice::OutputStream>::write(ostr, *this);
598
622
  ostr->endSlice();
599
623
  }
600
624
 
@@ -602,13 +626,16 @@ void
602
626
  IceMX::UnknownMetricsView::_readImpl(::Ice::InputStream* istr)
603
627
  {
604
628
  istr->startSlice();
605
- Ice::StreamReader< ::IceMX::UnknownMetricsView, ::Ice::InputStream>::read(istr, *this);
629
+ ::Ice::StreamReader< UnknownMetricsView, ::Ice::InputStream>::read(istr, *this);
606
630
  istr->endSlice();
607
631
  }
608
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::Metrics* p) { return p; }
632
+ /// \endcond
633
+
634
+ /// \cond INTERNAL
635
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(Metrics* p) { return p; }
609
636
 
610
637
  void
611
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::Metrics>& v)
638
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Metrics>& v)
612
639
  {
613
640
  ::Ice::ObjectPrx proxy;
614
641
  istr->read(proxy);
@@ -618,26 +645,31 @@ void
618
645
  }
619
646
  else
620
647
  {
621
- v = new ::IceProxy::IceMX::Metrics;
648
+ v = new Metrics;
622
649
  v->_copyFrom(proxy);
623
650
  }
624
651
  }
652
+ /// \endcond
625
653
 
654
+ /// \cond INTERNAL
626
655
  ::IceProxy::Ice::Object*
627
656
  IceProxy::IceMX::Metrics::_newInstance() const
628
657
  {
629
658
  return new Metrics;
630
659
  }
660
+ /// \endcond
631
661
 
632
662
  const ::std::string&
633
663
  IceProxy::IceMX::Metrics::ice_staticId()
634
664
  {
635
665
  return ::IceMX::Metrics::ice_staticId();
636
666
  }
637
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::MetricsAdmin* p) { return p; }
667
+
668
+ /// \cond INTERNAL
669
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(MetricsAdmin* p) { return p; }
638
670
 
639
671
  void
640
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::MetricsAdmin>& v)
672
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< MetricsAdmin>& v)
641
673
  {
642
674
  ::Ice::ObjectPrx proxy;
643
675
  istr->read(proxy);
@@ -647,10 +679,11 @@ void
647
679
  }
648
680
  else
649
681
  {
650
- v = new ::IceProxy::IceMX::MetricsAdmin;
682
+ v = new MetricsAdmin;
651
683
  v->_copyFrom(proxy);
652
684
  }
653
685
  }
686
+ /// \endcond
654
687
 
655
688
  ::Ice::AsyncResultPtr
656
689
  IceProxy::IceMX::MetricsAdmin::_iceI_begin_getMetricsViewNames(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -693,6 +726,26 @@ IceProxy::IceMX::MetricsAdmin::end_getMetricsViewNames(::Ice::StringSeq& iceP_di
693
726
  return ret;
694
727
  }
695
728
 
729
+ void IceProxy::IceMX::MetricsAdmin::_iceI_end_getMetricsViewNames(::Ice::StringSeq& iceP_disabledViews, ::Ice::StringSeq& ret, const ::Ice::AsyncResultPtr& result)
730
+ {
731
+ ::Ice::AsyncResult::_check(result, this, iceC_IceMX_MetricsAdmin_getMetricsViewNames_name);
732
+ if(!result->_waitForResponse())
733
+ {
734
+ try
735
+ {
736
+ result->_throwUserException();
737
+ }
738
+ catch(const ::Ice::UserException& ex)
739
+ {
740
+ throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
741
+ }
742
+ }
743
+ ::Ice::InputStream* istr = result->_startReadParams();
744
+ istr->read(iceP_disabledViews);
745
+ istr->read(ret);
746
+ result->_endReadParams();
747
+ }
748
+
696
749
  ::Ice::AsyncResultPtr
697
750
  IceProxy::IceMX::MetricsAdmin::_iceI_begin_enableMetricsView(const ::std::string& iceP_name, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
698
751
  {
@@ -825,6 +878,31 @@ IceProxy::IceMX::MetricsAdmin::end_getMetricsView(::Ice::Long& iceP_timestamp, c
825
878
  return ret;
826
879
  }
827
880
 
881
+ void IceProxy::IceMX::MetricsAdmin::_iceI_end_getMetricsView(::Ice::Long& iceP_timestamp, ::IceMX::MetricsView& ret, const ::Ice::AsyncResultPtr& result)
882
+ {
883
+ ::Ice::AsyncResult::_check(result, this, iceC_IceMX_MetricsAdmin_getMetricsView_name);
884
+ if(!result->_waitForResponse())
885
+ {
886
+ try
887
+ {
888
+ result->_throwUserException();
889
+ }
890
+ catch(const ::IceMX::UnknownMetricsView&)
891
+ {
892
+ throw;
893
+ }
894
+ catch(const ::Ice::UserException& ex)
895
+ {
896
+ throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
897
+ }
898
+ }
899
+ ::Ice::InputStream* istr = result->_startReadParams();
900
+ istr->read(iceP_timestamp);
901
+ istr->read(ret);
902
+ istr->readPendingValues();
903
+ result->_endReadParams();
904
+ }
905
+
828
906
  ::Ice::AsyncResultPtr
829
907
  IceProxy::IceMX::MetricsAdmin::_iceI_begin_getMapMetricsFailures(const ::std::string& iceP_view, const ::std::string& iceP_map, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
830
908
  {
@@ -920,21 +998,25 @@ IceProxy::IceMX::MetricsAdmin::end_getMetricsFailures(const ::Ice::AsyncResultPt
920
998
  return ret;
921
999
  }
922
1000
 
1001
+ /// \cond INTERNAL
923
1002
  ::IceProxy::Ice::Object*
924
1003
  IceProxy::IceMX::MetricsAdmin::_newInstance() const
925
1004
  {
926
1005
  return new MetricsAdmin;
927
1006
  }
1007
+ /// \endcond
928
1008
 
929
1009
  const ::std::string&
930
1010
  IceProxy::IceMX::MetricsAdmin::ice_staticId()
931
1011
  {
932
1012
  return ::IceMX::MetricsAdmin::ice_staticId();
933
1013
  }
934
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ThreadMetrics* p) { return p; }
1014
+
1015
+ /// \cond INTERNAL
1016
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(ThreadMetrics* p) { return p; }
935
1017
 
936
1018
  void
937
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ThreadMetrics>& v)
1019
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ThreadMetrics>& v)
938
1020
  {
939
1021
  ::Ice::ObjectPrx proxy;
940
1022
  istr->read(proxy);
@@ -944,26 +1026,31 @@ void
944
1026
  }
945
1027
  else
946
1028
  {
947
- v = new ::IceProxy::IceMX::ThreadMetrics;
1029
+ v = new ThreadMetrics;
948
1030
  v->_copyFrom(proxy);
949
1031
  }
950
1032
  }
1033
+ /// \endcond
951
1034
 
1035
+ /// \cond INTERNAL
952
1036
  ::IceProxy::Ice::Object*
953
1037
  IceProxy::IceMX::ThreadMetrics::_newInstance() const
954
1038
  {
955
1039
  return new ThreadMetrics;
956
1040
  }
1041
+ /// \endcond
957
1042
 
958
1043
  const ::std::string&
959
1044
  IceProxy::IceMX::ThreadMetrics::ice_staticId()
960
1045
  {
961
1046
  return ::IceMX::ThreadMetrics::ice_staticId();
962
1047
  }
963
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::DispatchMetrics* p) { return p; }
1048
+
1049
+ /// \cond INTERNAL
1050
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(DispatchMetrics* p) { return p; }
964
1051
 
965
1052
  void
966
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::DispatchMetrics>& v)
1053
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< DispatchMetrics>& v)
967
1054
  {
968
1055
  ::Ice::ObjectPrx proxy;
969
1056
  istr->read(proxy);
@@ -973,26 +1060,31 @@ void
973
1060
  }
974
1061
  else
975
1062
  {
976
- v = new ::IceProxy::IceMX::DispatchMetrics;
1063
+ v = new DispatchMetrics;
977
1064
  v->_copyFrom(proxy);
978
1065
  }
979
1066
  }
1067
+ /// \endcond
980
1068
 
1069
+ /// \cond INTERNAL
981
1070
  ::IceProxy::Ice::Object*
982
1071
  IceProxy::IceMX::DispatchMetrics::_newInstance() const
983
1072
  {
984
1073
  return new DispatchMetrics;
985
1074
  }
1075
+ /// \endcond
986
1076
 
987
1077
  const ::std::string&
988
1078
  IceProxy::IceMX::DispatchMetrics::ice_staticId()
989
1079
  {
990
1080
  return ::IceMX::DispatchMetrics::ice_staticId();
991
1081
  }
992
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ChildInvocationMetrics* p) { return p; }
1082
+
1083
+ /// \cond INTERNAL
1084
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(ChildInvocationMetrics* p) { return p; }
993
1085
 
994
1086
  void
995
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ChildInvocationMetrics>& v)
1087
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ChildInvocationMetrics>& v)
996
1088
  {
997
1089
  ::Ice::ObjectPrx proxy;
998
1090
  istr->read(proxy);
@@ -1002,26 +1094,31 @@ void
1002
1094
  }
1003
1095
  else
1004
1096
  {
1005
- v = new ::IceProxy::IceMX::ChildInvocationMetrics;
1097
+ v = new ChildInvocationMetrics;
1006
1098
  v->_copyFrom(proxy);
1007
1099
  }
1008
1100
  }
1101
+ /// \endcond
1009
1102
 
1103
+ /// \cond INTERNAL
1010
1104
  ::IceProxy::Ice::Object*
1011
1105
  IceProxy::IceMX::ChildInvocationMetrics::_newInstance() const
1012
1106
  {
1013
1107
  return new ChildInvocationMetrics;
1014
1108
  }
1109
+ /// \endcond
1015
1110
 
1016
1111
  const ::std::string&
1017
1112
  IceProxy::IceMX::ChildInvocationMetrics::ice_staticId()
1018
1113
  {
1019
1114
  return ::IceMX::ChildInvocationMetrics::ice_staticId();
1020
1115
  }
1021
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::CollocatedMetrics* p) { return p; }
1116
+
1117
+ /// \cond INTERNAL
1118
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(CollocatedMetrics* p) { return p; }
1022
1119
 
1023
1120
  void
1024
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::CollocatedMetrics>& v)
1121
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< CollocatedMetrics>& v)
1025
1122
  {
1026
1123
  ::Ice::ObjectPrx proxy;
1027
1124
  istr->read(proxy);
@@ -1031,26 +1128,31 @@ void
1031
1128
  }
1032
1129
  else
1033
1130
  {
1034
- v = new ::IceProxy::IceMX::CollocatedMetrics;
1131
+ v = new CollocatedMetrics;
1035
1132
  v->_copyFrom(proxy);
1036
1133
  }
1037
1134
  }
1135
+ /// \endcond
1038
1136
 
1137
+ /// \cond INTERNAL
1039
1138
  ::IceProxy::Ice::Object*
1040
1139
  IceProxy::IceMX::CollocatedMetrics::_newInstance() const
1041
1140
  {
1042
1141
  return new CollocatedMetrics;
1043
1142
  }
1143
+ /// \endcond
1044
1144
 
1045
1145
  const ::std::string&
1046
1146
  IceProxy::IceMX::CollocatedMetrics::ice_staticId()
1047
1147
  {
1048
1148
  return ::IceMX::CollocatedMetrics::ice_staticId();
1049
1149
  }
1050
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::RemoteMetrics* p) { return p; }
1150
+
1151
+ /// \cond INTERNAL
1152
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(RemoteMetrics* p) { return p; }
1051
1153
 
1052
1154
  void
1053
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::RemoteMetrics>& v)
1155
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< RemoteMetrics>& v)
1054
1156
  {
1055
1157
  ::Ice::ObjectPrx proxy;
1056
1158
  istr->read(proxy);
@@ -1060,26 +1162,31 @@ void
1060
1162
  }
1061
1163
  else
1062
1164
  {
1063
- v = new ::IceProxy::IceMX::RemoteMetrics;
1165
+ v = new RemoteMetrics;
1064
1166
  v->_copyFrom(proxy);
1065
1167
  }
1066
1168
  }
1169
+ /// \endcond
1067
1170
 
1171
+ /// \cond INTERNAL
1068
1172
  ::IceProxy::Ice::Object*
1069
1173
  IceProxy::IceMX::RemoteMetrics::_newInstance() const
1070
1174
  {
1071
1175
  return new RemoteMetrics;
1072
1176
  }
1177
+ /// \endcond
1073
1178
 
1074
1179
  const ::std::string&
1075
1180
  IceProxy::IceMX::RemoteMetrics::ice_staticId()
1076
1181
  {
1077
1182
  return ::IceMX::RemoteMetrics::ice_staticId();
1078
1183
  }
1079
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::InvocationMetrics* p) { return p; }
1184
+
1185
+ /// \cond INTERNAL
1186
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(InvocationMetrics* p) { return p; }
1080
1187
 
1081
1188
  void
1082
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::InvocationMetrics>& v)
1189
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< InvocationMetrics>& v)
1083
1190
  {
1084
1191
  ::Ice::ObjectPrx proxy;
1085
1192
  istr->read(proxy);
@@ -1089,26 +1196,31 @@ void
1089
1196
  }
1090
1197
  else
1091
1198
  {
1092
- v = new ::IceProxy::IceMX::InvocationMetrics;
1199
+ v = new InvocationMetrics;
1093
1200
  v->_copyFrom(proxy);
1094
1201
  }
1095
1202
  }
1203
+ /// \endcond
1096
1204
 
1205
+ /// \cond INTERNAL
1097
1206
  ::IceProxy::Ice::Object*
1098
1207
  IceProxy::IceMX::InvocationMetrics::_newInstance() const
1099
1208
  {
1100
1209
  return new InvocationMetrics;
1101
1210
  }
1211
+ /// \endcond
1102
1212
 
1103
1213
  const ::std::string&
1104
1214
  IceProxy::IceMX::InvocationMetrics::ice_staticId()
1105
1215
  {
1106
1216
  return ::IceMX::InvocationMetrics::ice_staticId();
1107
1217
  }
1108
- ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ConnectionMetrics* p) { return p; }
1218
+
1219
+ /// \cond INTERNAL
1220
+ ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(ConnectionMetrics* p) { return p; }
1109
1221
 
1110
1222
  void
1111
- ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ConnectionMetrics>& v)
1223
+ ::IceProxy::IceMX::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ConnectionMetrics>& v)
1112
1224
  {
1113
1225
  ::Ice::ObjectPrx proxy;
1114
1226
  istr->read(proxy);
@@ -1118,16 +1230,19 @@ void
1118
1230
  }
1119
1231
  else
1120
1232
  {
1121
- v = new ::IceProxy::IceMX::ConnectionMetrics;
1233
+ v = new ConnectionMetrics;
1122
1234
  v->_copyFrom(proxy);
1123
1235
  }
1124
1236
  }
1237
+ /// \endcond
1125
1238
 
1239
+ /// \cond INTERNAL
1126
1240
  ::IceProxy::Ice::Object*
1127
1241
  IceProxy::IceMX::ConnectionMetrics::_newInstance() const
1128
1242
  {
1129
1243
  return new ConnectionMetrics;
1130
1244
  }
1245
+ /// \endcond
1131
1246
 
1132
1247
  const ::std::string&
1133
1248
  IceProxy::IceMX::ConnectionMetrics::ice_staticId()
@@ -1139,8 +1254,10 @@ IceMX::Metrics::~Metrics()
1139
1254
  {
1140
1255
  }
1141
1256
 
1142
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::Metrics* p) { return p; }
1257
+ /// \cond INTERNAL
1258
+ ICE_API ::Ice::Object* IceMX::upCast(Metrics* p) { return p; }
1143
1259
 
1260
+ /// \endcond
1144
1261
  ::Ice::ObjectPtr
1145
1262
  IceMX::Metrics::ice_clone() const
1146
1263
  {
@@ -1187,11 +1304,12 @@ IceMX::Metrics::ice_staticId()
1187
1304
  #endif
1188
1305
  }
1189
1306
 
1307
+ /// \cond STREAM
1190
1308
  void
1191
1309
  IceMX::Metrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
1192
1310
  {
1193
1311
  ostr->startSlice(ice_staticId(), -1, true);
1194
- Ice::StreamWriter< ::IceMX::Metrics, ::Ice::OutputStream>::write(ostr, *this);
1312
+ ::Ice::StreamWriter< Metrics, ::Ice::OutputStream>::write(ostr, *this);
1195
1313
  ostr->endSlice();
1196
1314
  }
1197
1315
 
@@ -1199,9 +1317,10 @@ void
1199
1317
  IceMX::Metrics::_iceReadImpl(::Ice::InputStream* istr)
1200
1318
  {
1201
1319
  istr->startSlice();
1202
- Ice::StreamReader< ::IceMX::Metrics, ::Ice::InputStream>::read(istr, *this);
1320
+ ::Ice::StreamReader< Metrics, ::Ice::InputStream>::read(istr, *this);
1203
1321
  istr->endSlice();
1204
1322
  }
1323
+ /// \endcond
1205
1324
 
1206
1325
  namespace
1207
1326
  {
@@ -1214,22 +1333,26 @@ IceMX::Metrics::ice_factory()
1214
1333
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::Metrics::ice_staticId());
1215
1334
  }
1216
1335
 
1336
+ /// \cond INTERNAL
1217
1337
  void
1218
1338
  IceMX::_icePatchObjectPtr(MetricsPtr& handle, const ::Ice::ObjectPtr& v)
1219
1339
  {
1220
- handle = ::IceMX::MetricsPtr::dynamicCast(v);
1340
+ handle = MetricsPtr::dynamicCast(v);
1221
1341
  if(v && !handle)
1222
1342
  {
1223
- IceInternal::Ex::throwUOE(::IceMX::Metrics::ice_staticId(), v);
1343
+ IceInternal::Ex::throwUOE(Metrics::ice_staticId(), v);
1224
1344
  }
1225
1345
  }
1346
+ /// \endcond
1226
1347
 
1227
1348
  IceMX::MetricsAdmin::~MetricsAdmin()
1228
1349
  {
1229
1350
  }
1230
1351
 
1231
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::MetricsAdmin* p) { return p; }
1352
+ /// \cond INTERNAL
1353
+ ICE_API ::Ice::Object* IceMX::upCast(MetricsAdmin* p) { return p; }
1232
1354
 
1355
+ /// \endcond
1233
1356
 
1234
1357
  namespace
1235
1358
  {
@@ -1270,6 +1393,7 @@ IceMX::MetricsAdmin::ice_staticId()
1270
1393
  #endif
1271
1394
  }
1272
1395
 
1396
+ /// \cond INTERNAL
1273
1397
  bool
1274
1398
  IceMX::MetricsAdmin::_iceD_getMetricsViewNames(::IceInternal::Incoming& inS, const ::Ice::Current& current)
1275
1399
  {
@@ -1284,7 +1408,9 @@ IceMX::MetricsAdmin::_iceD_getMetricsViewNames(::IceInternal::Incoming& inS, con
1284
1408
  inS.endWriteParams();
1285
1409
  return true;
1286
1410
  }
1411
+ /// \endcond
1287
1412
 
1413
+ /// \cond INTERNAL
1288
1414
  bool
1289
1415
  IceMX::MetricsAdmin::_iceD_enableMetricsView(::IceInternal::Incoming& inS, const ::Ice::Current& current)
1290
1416
  {
@@ -1298,7 +1424,9 @@ IceMX::MetricsAdmin::_iceD_enableMetricsView(::IceInternal::Incoming& inS, const
1298
1424
  inS.writeEmptyParams();
1299
1425
  return true;
1300
1426
  }
1427
+ /// \endcond
1301
1428
 
1429
+ /// \cond INTERNAL
1302
1430
  bool
1303
1431
  IceMX::MetricsAdmin::_iceD_disableMetricsView(::IceInternal::Incoming& inS, const ::Ice::Current& current)
1304
1432
  {
@@ -1312,7 +1440,9 @@ IceMX::MetricsAdmin::_iceD_disableMetricsView(::IceInternal::Incoming& inS, cons
1312
1440
  inS.writeEmptyParams();
1313
1441
  return true;
1314
1442
  }
1443
+ /// \endcond
1315
1444
 
1445
+ /// \cond INTERNAL
1316
1446
  bool
1317
1447
  IceMX::MetricsAdmin::_iceD_getMetricsView(::IceInternal::Incoming& inS, const ::Ice::Current& current)
1318
1448
  {
@@ -1323,7 +1453,7 @@ IceMX::MetricsAdmin::_iceD_getMetricsView(::IceInternal::Incoming& inS, const ::
1323
1453
  inS.endReadParams();
1324
1454
  inS.setFormat(::Ice::SlicedFormat);
1325
1455
  ::Ice::Long iceP_timestamp;
1326
- ::IceMX::MetricsView ret = this->getMetricsView(iceP_view, iceP_timestamp, current);
1456
+ MetricsView ret = this->getMetricsView(iceP_view, iceP_timestamp, current);
1327
1457
  ::Ice::OutputStream* ostr = inS.startWriteParams();
1328
1458
  ostr->write(iceP_timestamp);
1329
1459
  ostr->write(ret);
@@ -1331,7 +1461,9 @@ IceMX::MetricsAdmin::_iceD_getMetricsView(::IceInternal::Incoming& inS, const ::
1331
1461
  inS.endWriteParams();
1332
1462
  return true;
1333
1463
  }
1464
+ /// \endcond
1334
1465
 
1466
+ /// \cond INTERNAL
1335
1467
  bool
1336
1468
  IceMX::MetricsAdmin::_iceD_getMapMetricsFailures(::IceInternal::Incoming& inS, const ::Ice::Current& current)
1337
1469
  {
@@ -1343,13 +1475,15 @@ IceMX::MetricsAdmin::_iceD_getMapMetricsFailures(::IceInternal::Incoming& inS, c
1343
1475
  istr->read(iceP_map);
1344
1476
  inS.endReadParams();
1345
1477
  inS.setFormat(::Ice::SlicedFormat);
1346
- ::IceMX::MetricsFailuresSeq ret = this->getMapMetricsFailures(iceP_view, iceP_map, current);
1478
+ MetricsFailuresSeq ret = this->getMapMetricsFailures(iceP_view, iceP_map, current);
1347
1479
  ::Ice::OutputStream* ostr = inS.startWriteParams();
1348
1480
  ostr->write(ret);
1349
1481
  inS.endWriteParams();
1350
1482
  return true;
1351
1483
  }
1484
+ /// \endcond
1352
1485
 
1486
+ /// \cond INTERNAL
1353
1487
  bool
1354
1488
  IceMX::MetricsAdmin::_iceD_getMetricsFailures(::IceInternal::Incoming& inS, const ::Ice::Current& current)
1355
1489
  {
@@ -1363,12 +1497,13 @@ IceMX::MetricsAdmin::_iceD_getMetricsFailures(::IceInternal::Incoming& inS, cons
1363
1497
  istr->read(iceP_id);
1364
1498
  inS.endReadParams();
1365
1499
  inS.setFormat(::Ice::SlicedFormat);
1366
- ::IceMX::MetricsFailures ret = this->getMetricsFailures(iceP_view, iceP_map, iceP_id, current);
1500
+ MetricsFailures ret = this->getMetricsFailures(iceP_view, iceP_map, iceP_id, current);
1367
1501
  ::Ice::OutputStream* ostr = inS.startWriteParams();
1368
1502
  ostr->write(ret);
1369
1503
  inS.endWriteParams();
1370
1504
  return true;
1371
1505
  }
1506
+ /// \endcond
1372
1507
 
1373
1508
  namespace
1374
1509
  {
@@ -1388,6 +1523,7 @@ const ::std::string iceC_IceMX_MetricsAdmin_all[] =
1388
1523
 
1389
1524
  }
1390
1525
 
1526
+ /// \cond INTERNAL
1391
1527
  bool
1392
1528
  IceMX::MetricsAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
1393
1529
  {
@@ -1446,12 +1582,14 @@ IceMX::MetricsAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Curr
1446
1582
  }
1447
1583
  }
1448
1584
  }
1585
+ /// \endcond
1449
1586
 
1587
+ /// \cond STREAM
1450
1588
  void
1451
1589
  IceMX::MetricsAdmin::_iceWriteImpl(::Ice::OutputStream* ostr) const
1452
1590
  {
1453
1591
  ostr->startSlice(ice_staticId(), -1, true);
1454
- Ice::StreamWriter< ::IceMX::MetricsAdmin, ::Ice::OutputStream>::write(ostr, *this);
1592
+ ::Ice::StreamWriter< MetricsAdmin, ::Ice::OutputStream>::write(ostr, *this);
1455
1593
  ostr->endSlice();
1456
1594
  }
1457
1595
 
@@ -1459,26 +1597,31 @@ void
1459
1597
  IceMX::MetricsAdmin::_iceReadImpl(::Ice::InputStream* istr)
1460
1598
  {
1461
1599
  istr->startSlice();
1462
- Ice::StreamReader< ::IceMX::MetricsAdmin, ::Ice::InputStream>::read(istr, *this);
1600
+ ::Ice::StreamReader< MetricsAdmin, ::Ice::InputStream>::read(istr, *this);
1463
1601
  istr->endSlice();
1464
1602
  }
1603
+ /// \endcond
1465
1604
 
1605
+ /// \cond INTERNAL
1466
1606
  void
1467
1607
  IceMX::_icePatchObjectPtr(MetricsAdminPtr& handle, const ::Ice::ObjectPtr& v)
1468
1608
  {
1469
- handle = ::IceMX::MetricsAdminPtr::dynamicCast(v);
1609
+ handle = MetricsAdminPtr::dynamicCast(v);
1470
1610
  if(v && !handle)
1471
1611
  {
1472
- IceInternal::Ex::throwUOE(::IceMX::MetricsAdmin::ice_staticId(), v);
1612
+ IceInternal::Ex::throwUOE(MetricsAdmin::ice_staticId(), v);
1473
1613
  }
1474
1614
  }
1615
+ /// \endcond
1475
1616
 
1476
1617
  IceMX::ThreadMetrics::~ThreadMetrics()
1477
1618
  {
1478
1619
  }
1479
1620
 
1480
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::ThreadMetrics* p) { return p; }
1621
+ /// \cond INTERNAL
1622
+ ICE_API ::Ice::Object* IceMX::upCast(ThreadMetrics* p) { return p; }
1481
1623
 
1624
+ /// \endcond
1482
1625
  ::Ice::ObjectPtr
1483
1626
  IceMX::ThreadMetrics::ice_clone() const
1484
1627
  {
@@ -1526,23 +1669,25 @@ IceMX::ThreadMetrics::ice_staticId()
1526
1669
  #endif
1527
1670
  }
1528
1671
 
1672
+ /// \cond STREAM
1529
1673
  void
1530
1674
  IceMX::ThreadMetrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
1531
1675
  {
1532
1676
  ostr->startSlice(ice_staticId(), -1, false);
1533
- Ice::StreamWriter< ::IceMX::ThreadMetrics, ::Ice::OutputStream>::write(ostr, *this);
1677
+ ::Ice::StreamWriter< ThreadMetrics, ::Ice::OutputStream>::write(ostr, *this);
1534
1678
  ostr->endSlice();
1535
- ::IceMX::Metrics::_iceWriteImpl(ostr);
1679
+ Metrics::_iceWriteImpl(ostr);
1536
1680
  }
1537
1681
 
1538
1682
  void
1539
1683
  IceMX::ThreadMetrics::_iceReadImpl(::Ice::InputStream* istr)
1540
1684
  {
1541
1685
  istr->startSlice();
1542
- Ice::StreamReader< ::IceMX::ThreadMetrics, ::Ice::InputStream>::read(istr, *this);
1686
+ ::Ice::StreamReader< ThreadMetrics, ::Ice::InputStream>::read(istr, *this);
1543
1687
  istr->endSlice();
1544
- ::IceMX::Metrics::_iceReadImpl(istr);
1688
+ Metrics::_iceReadImpl(istr);
1545
1689
  }
1690
+ /// \endcond
1546
1691
 
1547
1692
  namespace
1548
1693
  {
@@ -1555,22 +1700,26 @@ IceMX::ThreadMetrics::ice_factory()
1555
1700
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::ThreadMetrics::ice_staticId());
1556
1701
  }
1557
1702
 
1703
+ /// \cond INTERNAL
1558
1704
  void
1559
1705
  IceMX::_icePatchObjectPtr(ThreadMetricsPtr& handle, const ::Ice::ObjectPtr& v)
1560
1706
  {
1561
- handle = ::IceMX::ThreadMetricsPtr::dynamicCast(v);
1707
+ handle = ThreadMetricsPtr::dynamicCast(v);
1562
1708
  if(v && !handle)
1563
1709
  {
1564
- IceInternal::Ex::throwUOE(::IceMX::ThreadMetrics::ice_staticId(), v);
1710
+ IceInternal::Ex::throwUOE(ThreadMetrics::ice_staticId(), v);
1565
1711
  }
1566
1712
  }
1713
+ /// \endcond
1567
1714
 
1568
1715
  IceMX::DispatchMetrics::~DispatchMetrics()
1569
1716
  {
1570
1717
  }
1571
1718
 
1572
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::DispatchMetrics* p) { return p; }
1719
+ /// \cond INTERNAL
1720
+ ICE_API ::Ice::Object* IceMX::upCast(DispatchMetrics* p) { return p; }
1573
1721
 
1722
+ /// \endcond
1574
1723
  ::Ice::ObjectPtr
1575
1724
  IceMX::DispatchMetrics::ice_clone() const
1576
1725
  {
@@ -1618,23 +1767,25 @@ IceMX::DispatchMetrics::ice_staticId()
1618
1767
  #endif
1619
1768
  }
1620
1769
 
1770
+ /// \cond STREAM
1621
1771
  void
1622
1772
  IceMX::DispatchMetrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
1623
1773
  {
1624
1774
  ostr->startSlice(ice_staticId(), -1, false);
1625
- Ice::StreamWriter< ::IceMX::DispatchMetrics, ::Ice::OutputStream>::write(ostr, *this);
1775
+ ::Ice::StreamWriter< DispatchMetrics, ::Ice::OutputStream>::write(ostr, *this);
1626
1776
  ostr->endSlice();
1627
- ::IceMX::Metrics::_iceWriteImpl(ostr);
1777
+ Metrics::_iceWriteImpl(ostr);
1628
1778
  }
1629
1779
 
1630
1780
  void
1631
1781
  IceMX::DispatchMetrics::_iceReadImpl(::Ice::InputStream* istr)
1632
1782
  {
1633
1783
  istr->startSlice();
1634
- Ice::StreamReader< ::IceMX::DispatchMetrics, ::Ice::InputStream>::read(istr, *this);
1784
+ ::Ice::StreamReader< DispatchMetrics, ::Ice::InputStream>::read(istr, *this);
1635
1785
  istr->endSlice();
1636
- ::IceMX::Metrics::_iceReadImpl(istr);
1786
+ Metrics::_iceReadImpl(istr);
1637
1787
  }
1788
+ /// \endcond
1638
1789
 
1639
1790
  namespace
1640
1791
  {
@@ -1647,22 +1798,26 @@ IceMX::DispatchMetrics::ice_factory()
1647
1798
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::DispatchMetrics::ice_staticId());
1648
1799
  }
1649
1800
 
1801
+ /// \cond INTERNAL
1650
1802
  void
1651
1803
  IceMX::_icePatchObjectPtr(DispatchMetricsPtr& handle, const ::Ice::ObjectPtr& v)
1652
1804
  {
1653
- handle = ::IceMX::DispatchMetricsPtr::dynamicCast(v);
1805
+ handle = DispatchMetricsPtr::dynamicCast(v);
1654
1806
  if(v && !handle)
1655
1807
  {
1656
- IceInternal::Ex::throwUOE(::IceMX::DispatchMetrics::ice_staticId(), v);
1808
+ IceInternal::Ex::throwUOE(DispatchMetrics::ice_staticId(), v);
1657
1809
  }
1658
1810
  }
1811
+ /// \endcond
1659
1812
 
1660
1813
  IceMX::ChildInvocationMetrics::~ChildInvocationMetrics()
1661
1814
  {
1662
1815
  }
1663
1816
 
1664
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::ChildInvocationMetrics* p) { return p; }
1817
+ /// \cond INTERNAL
1818
+ ICE_API ::Ice::Object* IceMX::upCast(ChildInvocationMetrics* p) { return p; }
1665
1819
 
1820
+ /// \endcond
1666
1821
  ::Ice::ObjectPtr
1667
1822
  IceMX::ChildInvocationMetrics::ice_clone() const
1668
1823
  {
@@ -1710,23 +1865,25 @@ IceMX::ChildInvocationMetrics::ice_staticId()
1710
1865
  #endif
1711
1866
  }
1712
1867
 
1868
+ /// \cond STREAM
1713
1869
  void
1714
1870
  IceMX::ChildInvocationMetrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
1715
1871
  {
1716
1872
  ostr->startSlice(ice_staticId(), -1, false);
1717
- Ice::StreamWriter< ::IceMX::ChildInvocationMetrics, ::Ice::OutputStream>::write(ostr, *this);
1873
+ ::Ice::StreamWriter< ChildInvocationMetrics, ::Ice::OutputStream>::write(ostr, *this);
1718
1874
  ostr->endSlice();
1719
- ::IceMX::Metrics::_iceWriteImpl(ostr);
1875
+ Metrics::_iceWriteImpl(ostr);
1720
1876
  }
1721
1877
 
1722
1878
  void
1723
1879
  IceMX::ChildInvocationMetrics::_iceReadImpl(::Ice::InputStream* istr)
1724
1880
  {
1725
1881
  istr->startSlice();
1726
- Ice::StreamReader< ::IceMX::ChildInvocationMetrics, ::Ice::InputStream>::read(istr, *this);
1882
+ ::Ice::StreamReader< ChildInvocationMetrics, ::Ice::InputStream>::read(istr, *this);
1727
1883
  istr->endSlice();
1728
- ::IceMX::Metrics::_iceReadImpl(istr);
1884
+ Metrics::_iceReadImpl(istr);
1729
1885
  }
1886
+ /// \endcond
1730
1887
 
1731
1888
  namespace
1732
1889
  {
@@ -1739,22 +1896,26 @@ IceMX::ChildInvocationMetrics::ice_factory()
1739
1896
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::ChildInvocationMetrics::ice_staticId());
1740
1897
  }
1741
1898
 
1899
+ /// \cond INTERNAL
1742
1900
  void
1743
1901
  IceMX::_icePatchObjectPtr(ChildInvocationMetricsPtr& handle, const ::Ice::ObjectPtr& v)
1744
1902
  {
1745
- handle = ::IceMX::ChildInvocationMetricsPtr::dynamicCast(v);
1903
+ handle = ChildInvocationMetricsPtr::dynamicCast(v);
1746
1904
  if(v && !handle)
1747
1905
  {
1748
- IceInternal::Ex::throwUOE(::IceMX::ChildInvocationMetrics::ice_staticId(), v);
1906
+ IceInternal::Ex::throwUOE(ChildInvocationMetrics::ice_staticId(), v);
1749
1907
  }
1750
1908
  }
1909
+ /// \endcond
1751
1910
 
1752
1911
  IceMX::CollocatedMetrics::~CollocatedMetrics()
1753
1912
  {
1754
1913
  }
1755
1914
 
1756
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::CollocatedMetrics* p) { return p; }
1915
+ /// \cond INTERNAL
1916
+ ICE_API ::Ice::Object* IceMX::upCast(CollocatedMetrics* p) { return p; }
1757
1917
 
1918
+ /// \endcond
1758
1919
  ::Ice::ObjectPtr
1759
1920
  IceMX::CollocatedMetrics::ice_clone() const
1760
1921
  {
@@ -1803,23 +1964,25 @@ IceMX::CollocatedMetrics::ice_staticId()
1803
1964
  #endif
1804
1965
  }
1805
1966
 
1967
+ /// \cond STREAM
1806
1968
  void
1807
1969
  IceMX::CollocatedMetrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
1808
1970
  {
1809
1971
  ostr->startSlice(ice_staticId(), -1, false);
1810
- Ice::StreamWriter< ::IceMX::CollocatedMetrics, ::Ice::OutputStream>::write(ostr, *this);
1972
+ ::Ice::StreamWriter< CollocatedMetrics, ::Ice::OutputStream>::write(ostr, *this);
1811
1973
  ostr->endSlice();
1812
- ::IceMX::ChildInvocationMetrics::_iceWriteImpl(ostr);
1974
+ ChildInvocationMetrics::_iceWriteImpl(ostr);
1813
1975
  }
1814
1976
 
1815
1977
  void
1816
1978
  IceMX::CollocatedMetrics::_iceReadImpl(::Ice::InputStream* istr)
1817
1979
  {
1818
1980
  istr->startSlice();
1819
- Ice::StreamReader< ::IceMX::CollocatedMetrics, ::Ice::InputStream>::read(istr, *this);
1981
+ ::Ice::StreamReader< CollocatedMetrics, ::Ice::InputStream>::read(istr, *this);
1820
1982
  istr->endSlice();
1821
- ::IceMX::ChildInvocationMetrics::_iceReadImpl(istr);
1983
+ ChildInvocationMetrics::_iceReadImpl(istr);
1822
1984
  }
1985
+ /// \endcond
1823
1986
 
1824
1987
  namespace
1825
1988
  {
@@ -1832,22 +1995,26 @@ IceMX::CollocatedMetrics::ice_factory()
1832
1995
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::CollocatedMetrics::ice_staticId());
1833
1996
  }
1834
1997
 
1998
+ /// \cond INTERNAL
1835
1999
  void
1836
2000
  IceMX::_icePatchObjectPtr(CollocatedMetricsPtr& handle, const ::Ice::ObjectPtr& v)
1837
2001
  {
1838
- handle = ::IceMX::CollocatedMetricsPtr::dynamicCast(v);
2002
+ handle = CollocatedMetricsPtr::dynamicCast(v);
1839
2003
  if(v && !handle)
1840
2004
  {
1841
- IceInternal::Ex::throwUOE(::IceMX::CollocatedMetrics::ice_staticId(), v);
2005
+ IceInternal::Ex::throwUOE(CollocatedMetrics::ice_staticId(), v);
1842
2006
  }
1843
2007
  }
2008
+ /// \endcond
1844
2009
 
1845
2010
  IceMX::RemoteMetrics::~RemoteMetrics()
1846
2011
  {
1847
2012
  }
1848
2013
 
1849
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::RemoteMetrics* p) { return p; }
2014
+ /// \cond INTERNAL
2015
+ ICE_API ::Ice::Object* IceMX::upCast(RemoteMetrics* p) { return p; }
1850
2016
 
2017
+ /// \endcond
1851
2018
  ::Ice::ObjectPtr
1852
2019
  IceMX::RemoteMetrics::ice_clone() const
1853
2020
  {
@@ -1896,23 +2063,25 @@ IceMX::RemoteMetrics::ice_staticId()
1896
2063
  #endif
1897
2064
  }
1898
2065
 
2066
+ /// \cond STREAM
1899
2067
  void
1900
2068
  IceMX::RemoteMetrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
1901
2069
  {
1902
2070
  ostr->startSlice(ice_staticId(), -1, false);
1903
- Ice::StreamWriter< ::IceMX::RemoteMetrics, ::Ice::OutputStream>::write(ostr, *this);
2071
+ ::Ice::StreamWriter< RemoteMetrics, ::Ice::OutputStream>::write(ostr, *this);
1904
2072
  ostr->endSlice();
1905
- ::IceMX::ChildInvocationMetrics::_iceWriteImpl(ostr);
2073
+ ChildInvocationMetrics::_iceWriteImpl(ostr);
1906
2074
  }
1907
2075
 
1908
2076
  void
1909
2077
  IceMX::RemoteMetrics::_iceReadImpl(::Ice::InputStream* istr)
1910
2078
  {
1911
2079
  istr->startSlice();
1912
- Ice::StreamReader< ::IceMX::RemoteMetrics, ::Ice::InputStream>::read(istr, *this);
2080
+ ::Ice::StreamReader< RemoteMetrics, ::Ice::InputStream>::read(istr, *this);
1913
2081
  istr->endSlice();
1914
- ::IceMX::ChildInvocationMetrics::_iceReadImpl(istr);
2082
+ ChildInvocationMetrics::_iceReadImpl(istr);
1915
2083
  }
2084
+ /// \endcond
1916
2085
 
1917
2086
  namespace
1918
2087
  {
@@ -1925,22 +2094,26 @@ IceMX::RemoteMetrics::ice_factory()
1925
2094
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::RemoteMetrics::ice_staticId());
1926
2095
  }
1927
2096
 
2097
+ /// \cond INTERNAL
1928
2098
  void
1929
2099
  IceMX::_icePatchObjectPtr(RemoteMetricsPtr& handle, const ::Ice::ObjectPtr& v)
1930
2100
  {
1931
- handle = ::IceMX::RemoteMetricsPtr::dynamicCast(v);
2101
+ handle = RemoteMetricsPtr::dynamicCast(v);
1932
2102
  if(v && !handle)
1933
2103
  {
1934
- IceInternal::Ex::throwUOE(::IceMX::RemoteMetrics::ice_staticId(), v);
2104
+ IceInternal::Ex::throwUOE(RemoteMetrics::ice_staticId(), v);
1935
2105
  }
1936
2106
  }
2107
+ /// \endcond
1937
2108
 
1938
2109
  IceMX::InvocationMetrics::~InvocationMetrics()
1939
2110
  {
1940
2111
  }
1941
2112
 
1942
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::InvocationMetrics* p) { return p; }
2113
+ /// \cond INTERNAL
2114
+ ICE_API ::Ice::Object* IceMX::upCast(InvocationMetrics* p) { return p; }
1943
2115
 
2116
+ /// \endcond
1944
2117
 
1945
2118
  #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1946
2119
  # pragma warning(push)
@@ -2025,23 +2198,25 @@ IceMX::InvocationMetrics::_iceGcVisitMembers(::IceInternal::GCVisitor& v_)
2025
2198
  }
2026
2199
  }
2027
2200
 
2201
+ /// \cond STREAM
2028
2202
  void
2029
2203
  IceMX::InvocationMetrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
2030
2204
  {
2031
2205
  ostr->startSlice(ice_staticId(), -1, false);
2032
- Ice::StreamWriter< ::IceMX::InvocationMetrics, ::Ice::OutputStream>::write(ostr, *this);
2206
+ ::Ice::StreamWriter< InvocationMetrics, ::Ice::OutputStream>::write(ostr, *this);
2033
2207
  ostr->endSlice();
2034
- ::IceMX::Metrics::_iceWriteImpl(ostr);
2208
+ Metrics::_iceWriteImpl(ostr);
2035
2209
  }
2036
2210
 
2037
2211
  void
2038
2212
  IceMX::InvocationMetrics::_iceReadImpl(::Ice::InputStream* istr)
2039
2213
  {
2040
2214
  istr->startSlice();
2041
- Ice::StreamReader< ::IceMX::InvocationMetrics, ::Ice::InputStream>::read(istr, *this);
2215
+ ::Ice::StreamReader< InvocationMetrics, ::Ice::InputStream>::read(istr, *this);
2042
2216
  istr->endSlice();
2043
- ::IceMX::Metrics::_iceReadImpl(istr);
2217
+ Metrics::_iceReadImpl(istr);
2044
2218
  }
2219
+ /// \endcond
2045
2220
 
2046
2221
  namespace
2047
2222
  {
@@ -2054,22 +2229,26 @@ IceMX::InvocationMetrics::ice_factory()
2054
2229
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::InvocationMetrics::ice_staticId());
2055
2230
  }
2056
2231
 
2232
+ /// \cond INTERNAL
2057
2233
  void
2058
2234
  IceMX::_icePatchObjectPtr(InvocationMetricsPtr& handle, const ::Ice::ObjectPtr& v)
2059
2235
  {
2060
- handle = ::IceMX::InvocationMetricsPtr::dynamicCast(v);
2236
+ handle = InvocationMetricsPtr::dynamicCast(v);
2061
2237
  if(v && !handle)
2062
2238
  {
2063
- IceInternal::Ex::throwUOE(::IceMX::InvocationMetrics::ice_staticId(), v);
2239
+ IceInternal::Ex::throwUOE(InvocationMetrics::ice_staticId(), v);
2064
2240
  }
2065
2241
  }
2242
+ /// \endcond
2066
2243
 
2067
2244
  IceMX::ConnectionMetrics::~ConnectionMetrics()
2068
2245
  {
2069
2246
  }
2070
2247
 
2071
- ICE_API ::Ice::Object* IceMX::upCast(::IceMX::ConnectionMetrics* p) { return p; }
2248
+ /// \cond INTERNAL
2249
+ ICE_API ::Ice::Object* IceMX::upCast(ConnectionMetrics* p) { return p; }
2072
2250
 
2251
+ /// \endcond
2073
2252
  ::Ice::ObjectPtr
2074
2253
  IceMX::ConnectionMetrics::ice_clone() const
2075
2254
  {
@@ -2117,23 +2296,25 @@ IceMX::ConnectionMetrics::ice_staticId()
2117
2296
  #endif
2118
2297
  }
2119
2298
 
2299
+ /// \cond STREAM
2120
2300
  void
2121
2301
  IceMX::ConnectionMetrics::_iceWriteImpl(::Ice::OutputStream* ostr) const
2122
2302
  {
2123
2303
  ostr->startSlice(ice_staticId(), -1, false);
2124
- Ice::StreamWriter< ::IceMX::ConnectionMetrics, ::Ice::OutputStream>::write(ostr, *this);
2304
+ ::Ice::StreamWriter< ConnectionMetrics, ::Ice::OutputStream>::write(ostr, *this);
2125
2305
  ostr->endSlice();
2126
- ::IceMX::Metrics::_iceWriteImpl(ostr);
2306
+ Metrics::_iceWriteImpl(ostr);
2127
2307
  }
2128
2308
 
2129
2309
  void
2130
2310
  IceMX::ConnectionMetrics::_iceReadImpl(::Ice::InputStream* istr)
2131
2311
  {
2132
2312
  istr->startSlice();
2133
- Ice::StreamReader< ::IceMX::ConnectionMetrics, ::Ice::InputStream>::read(istr, *this);
2313
+ ::Ice::StreamReader< ConnectionMetrics, ::Ice::InputStream>::read(istr, *this);
2134
2314
  istr->endSlice();
2135
- ::IceMX::Metrics::_iceReadImpl(istr);
2315
+ Metrics::_iceReadImpl(istr);
2136
2316
  }
2317
+ /// \endcond
2137
2318
 
2138
2319
  namespace
2139
2320
  {
@@ -2146,15 +2327,17 @@ IceMX::ConnectionMetrics::ice_factory()
2146
2327
  return ::IceInternal::factoryTable->getValueFactory(::IceMX::ConnectionMetrics::ice_staticId());
2147
2328
  }
2148
2329
 
2330
+ /// \cond INTERNAL
2149
2331
  void
2150
2332
  IceMX::_icePatchObjectPtr(ConnectionMetricsPtr& handle, const ::Ice::ObjectPtr& v)
2151
2333
  {
2152
- handle = ::IceMX::ConnectionMetricsPtr::dynamicCast(v);
2334
+ handle = ConnectionMetricsPtr::dynamicCast(v);
2153
2335
  if(v && !handle)
2154
2336
  {
2155
- IceInternal::Ex::throwUOE(::IceMX::ConnectionMetrics::ice_staticId(), v);
2337
+ IceInternal::Ex::throwUOE(ConnectionMetrics::ice_staticId(), v);
2156
2338
  }
2157
2339
  }
2340
+ /// \endcond
2158
2341
 
2159
2342
  namespace Ice
2160
2343
  {