zeroc-ice 3.7.1 → 3.7.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (677) hide show
  1. checksums.yaml +4 -4
  2. data/ICE_LICENSE +1 -1
  3. data/bin/slice2rb +1 -6
  4. data/ext/Communicator.cpp +4 -9
  5. data/ext/Communicator.h +1 -6
  6. data/ext/Config.h +18 -6
  7. data/ext/Connection.cpp +1 -10
  8. data/ext/Connection.h +1 -6
  9. data/ext/Endpoint.cpp +1 -10
  10. data/ext/Endpoint.h +1 -6
  11. data/ext/ImplicitContext.cpp +1 -6
  12. data/ext/ImplicitContext.h +1 -6
  13. data/ext/Init.cpp +1 -6
  14. data/ext/Logger.cpp +1 -6
  15. data/ext/Logger.h +1 -6
  16. data/ext/Operation.cpp +1 -6
  17. data/ext/Operation.h +1 -6
  18. data/ext/Properties.cpp +2 -7
  19. data/ext/Properties.h +1 -6
  20. data/ext/Proxy.cpp +5 -12
  21. data/ext/Proxy.h +1 -6
  22. data/ext/Slice.cpp +3 -18
  23. data/ext/Slice.h +1 -6
  24. data/ext/Types.cpp +11 -16
  25. data/ext/Types.h +1 -6
  26. data/ext/Util.cpp +45 -28
  27. data/ext/Util.h +62 -25
  28. data/ext/ValueFactoryManager.cpp +1 -6
  29. data/ext/ValueFactoryManager.h +1 -6
  30. data/ext/extconf.rb +5 -3
  31. data/ext/ice/cpp/include/Ice/Application.h +1 -6
  32. data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
  33. data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
  34. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
  35. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
  36. data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
  37. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -6
  38. data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
  39. data/ext/ice/cpp/include/Ice/Config.h +1 -6
  40. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
  41. data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -6
  42. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
  43. data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
  44. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -6
  45. data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
  46. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
  47. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
  48. data/ext/ice/cpp/include/Ice/Exception.h +1 -6
  49. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
  50. data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
  51. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -6
  52. data/ext/ice/cpp/include/Ice/Format.h +1 -6
  53. data/ext/ice/cpp/include/Ice/Functional.h +2 -7
  54. data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
  55. data/ext/ice/cpp/include/Ice/Handle.h +1 -6
  56. data/ext/ice/cpp/include/Ice/Ice.h +1 -6
  57. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +6 -13
  58. data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
  59. data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
  60. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
  61. data/ext/ice/cpp/include/Ice/Initialize.h +12 -6
  62. data/ext/ice/cpp/include/Ice/InputStream.h +2 -7
  63. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
  64. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
  65. data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
  66. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
  67. data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
  68. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
  69. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
  70. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
  71. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
  72. data/ext/ice/cpp/include/Ice/Object.h +1 -6
  73. data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
  74. data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
  75. data/ext/ice/cpp/include/Ice/Optional.h +9 -6
  76. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +2 -7
  77. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
  78. data/ext/ice/cpp/include/Ice/OutputStream.h +1 -6
  79. data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
  80. data/ext/ice/cpp/include/Ice/Proxy.h +2 -9
  81. data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
  82. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
  83. data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
  84. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
  85. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
  86. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
  87. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
  88. data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
  89. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
  90. data/ext/ice/cpp/include/Ice/Service.h +1 -6
  91. data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
  92. data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
  93. data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
  94. data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -6
  95. data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
  96. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
  97. data/ext/ice/cpp/include/Ice/UUID.h +1 -6
  98. data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
  99. data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
  100. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
  101. data/ext/ice/cpp/include/Ice/Value.h +1 -6
  102. data/ext/ice/cpp/include/Ice/ValueF.h +1 -6
  103. data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
  104. data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
  105. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +1 -6
  106. data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -6
  107. data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
  108. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
  109. data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
  110. data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -6
  111. data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
  112. data/ext/ice/cpp/include/IceUtil/Config.h +19 -16
  113. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -6
  114. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
  115. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +26 -38
  116. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
  117. data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
  118. data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
  119. data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
  120. data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
  121. data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
  122. data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
  123. data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
  124. data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
  125. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
  126. data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -9
  127. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
  128. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -6
  129. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
  130. data/ext/ice/cpp/include/IceUtil/Optional.h +1 -6
  131. data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
  132. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -6
  133. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
  134. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
  135. data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
  136. data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
  137. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
  138. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +2 -7
  139. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
  140. data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
  141. data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
  142. data/ext/ice/cpp/include/IceUtil/StringConverter.h +1 -6
  143. data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
  144. data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
  145. data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
  146. data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
  147. data/ext/ice/cpp/include/IceUtil/Timer.h +1 -6
  148. data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
  149. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
  150. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +11 -16
  151. data/ext/ice/cpp/include/generated/Ice/Communicator.h +26 -31
  152. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +3 -8
  153. data/ext/ice/cpp/include/generated/Ice/Connection.h +5 -10
  154. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +3 -8
  155. data/ext/ice/cpp/include/generated/Ice/Current.h +33 -38
  156. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +3 -8
  157. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +4 -9
  158. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +7 -12
  159. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +4 -9
  160. data/ext/ice/cpp/include/generated/Ice/Identity.h +5 -10
  161. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +21 -26
  162. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +3 -8
  163. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +3 -8
  164. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +3 -8
  165. data/ext/ice/cpp/include/generated/Ice/LocalException.h +51 -56
  166. data/ext/ice/cpp/include/generated/Ice/Locator.h +61 -21
  167. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +7 -12
  168. data/ext/ice/cpp/include/generated/Ice/Logger.h +3 -8
  169. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +3 -8
  170. data/ext/ice/cpp/include/generated/Ice/Metrics.h +33 -40
  171. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +13 -18
  172. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +3 -8
  173. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +9 -14
  174. data/ext/ice/cpp/include/generated/Ice/Plugin.h +5 -10
  175. data/ext/ice/cpp/include/generated/Ice/PluginF.h +3 -8
  176. data/ext/ice/cpp/include/generated/Ice/Process.h +7 -12
  177. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +5 -10
  178. data/ext/ice/cpp/include/generated/Ice/Properties.h +15 -20
  179. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -13
  180. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +5 -10
  181. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +13 -18
  182. data/ext/ice/cpp/include/generated/Ice/Router.h +14 -19
  183. data/ext/ice/cpp/include/generated/Ice/RouterF.h +5 -10
  184. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +31 -36
  185. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +3 -8
  186. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +3 -8
  187. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +9 -14
  188. data/ext/ice/cpp/include/generated/Ice/Version.h +3 -8
  189. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +3 -8
  190. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +3 -8
  191. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -8
  192. data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
  193. data/ext/ice/cpp/src/Ice/ACM.h +1 -6
  194. data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
  195. data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
  196. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
  197. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
  198. data/ext/ice/cpp/src/Ice/ArgVector.cpp +6 -11
  199. data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
  200. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
  201. data/ext/ice/cpp/src/Ice/Base64.cpp +1 -6
  202. data/ext/ice/cpp/src/Ice/Base64.h +1 -6
  203. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -6
  204. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
  205. data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -6
  206. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -8
  207. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
  208. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
  209. data/ext/ice/cpp/src/Ice/Communicator.cpp +3 -8
  210. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -8
  211. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +4 -10
  212. data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -7
  213. data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
  214. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
  216. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
  217. data/ext/ice/cpp/src/Ice/Connection.cpp +3 -8
  218. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -8
  219. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
  220. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
  221. data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
  222. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +3 -8
  223. data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
  224. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
  225. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
  226. data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
  227. data/ext/ice/cpp/src/Ice/Connector.h +1 -6
  228. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
  229. data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
  230. data/ext/ice/cpp/src/Ice/Current.cpp +3 -8
  231. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -6
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
  233. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
  234. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -6
  235. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -6
  236. data/ext/ice/cpp/src/Ice/Endpoint.cpp +3 -8
  237. data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -8
  238. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
  239. data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
  240. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -6
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
  243. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
  244. data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -6
  245. data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
  246. data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
  247. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -8
  248. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
  249. data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
  250. data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
  251. data/ext/ice/cpp/src/Ice/Exception.cpp +3 -8
  252. data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -8
  253. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
  254. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
  255. data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
  256. data/ext/ice/cpp/src/Ice/HashUtil.h +1 -6
  257. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
  258. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
  259. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +2 -30
  260. data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
  261. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
  262. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
  263. data/ext/ice/cpp/src/Ice/Identity.cpp +3 -8
  264. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +3 -8
  265. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -8
  266. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -7
  267. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
  268. data/ext/ice/cpp/src/Ice/Incoming.cpp +9 -13
  269. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
  270. data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
  271. data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -7
  272. data/ext/ice/cpp/src/Ice/InputStream.cpp +7 -54
  273. data/ext/ice/cpp/src/Ice/Instance.cpp +30 -8
  274. data/ext/ice/cpp/src/Ice/Instance.h +1 -6
  275. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +3 -8
  276. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -8
  277. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
  278. data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
  279. data/ext/ice/cpp/src/Ice/LocalException.cpp +3 -8
  280. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
  281. data/ext/ice/cpp/src/Ice/Locator.cpp +17 -22
  282. data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -8
  283. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
  284. data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
  285. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
  286. data/ext/ice/cpp/src/Ice/Logger.cpp +3 -8
  287. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +7 -12
  288. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
  289. data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -8
  290. data/ext/ice/cpp/src/Ice/LoggerI.cpp +7 -12
  291. data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
  292. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
  293. data/ext/ice/cpp/src/Ice/Metrics.cpp +3 -8
  294. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
  295. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
  296. data/ext/ice/cpp/src/Ice/Network.cpp +46 -29
  297. data/ext/ice/cpp/src/Ice/Network.h +3 -8
  298. data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
  299. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
  300. data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
  301. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
  302. data/ext/ice/cpp/src/Ice/Object.cpp +1 -7
  303. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +3 -8
  304. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -8
  305. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
  306. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
  307. data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
  308. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +9 -6
  309. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -6
  310. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -8
  311. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
  312. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
  313. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
  314. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +5 -8
  315. data/ext/ice/cpp/src/Ice/OutputStream.cpp +5 -37
  316. data/ext/ice/cpp/src/Ice/Plugin.cpp +3 -8
  317. data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -8
  318. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
  319. data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
  320. data/ext/ice/cpp/src/Ice/Process.cpp +7 -12
  321. data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -8
  322. data/ext/ice/cpp/src/Ice/Properties.cpp +3 -8
  323. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +9 -14
  324. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
  325. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
  326. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -8
  327. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +13 -17
  328. data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
  329. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +41 -8
  330. data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
  331. data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
  332. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
  333. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
  334. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
  335. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
  336. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
  337. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
  338. data/ext/ice/cpp/src/Ice/Proxy.cpp +3 -8
  339. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -6
  340. data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
  341. data/ext/ice/cpp/src/Ice/Reference.cpp +61 -33
  342. data/ext/ice/cpp/src/Ice/Reference.h +1 -6
  343. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -8
  344. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
  345. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
  346. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -6
  347. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
  348. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +13 -18
  349. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
  350. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
  351. data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
  352. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
  353. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
  354. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
  355. data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
  356. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +2 -7
  357. data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
  358. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
  359. data/ext/ice/cpp/src/Ice/Router.cpp +11 -16
  360. data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -8
  361. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
  362. data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
  363. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
  364. data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -6
  365. data/ext/ice/cpp/src/Ice/Selector.cpp +46 -17
  366. data/ext/ice/cpp/src/Ice/Selector.h +1 -6
  367. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +3 -8
  368. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -8
  369. data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
  370. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
  371. data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
  372. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -8
  373. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
  374. data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
  375. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +9 -12
  376. data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
  377. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -6
  378. data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
  379. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
  380. data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
  381. data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
  382. data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
  383. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +3 -7
  384. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
  385. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -6
  386. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
  387. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +1 -6
  388. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
  389. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -6
  390. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
  391. data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
  392. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +6 -9
  393. data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -6
  394. data/ext/ice/cpp/src/Ice/Timer.cpp +1 -6
  395. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
  396. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
  397. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
  398. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
  399. data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
  400. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
  401. data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
  402. data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
  403. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
  404. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
  405. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +1 -6
  406. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
  407. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +23 -24
  408. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
  409. data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
  410. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +3 -8
  411. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
  412. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
  413. data/ext/ice/cpp/src/Ice/Version.cpp +3 -8
  414. data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
  415. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
  416. data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
  417. data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
  418. data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
  419. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -6
  420. data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
  421. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +2 -7
  422. data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
  423. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -8
  424. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +11 -16
  425. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
  426. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
  427. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
  428. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
  429. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
  430. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
  431. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -8
  432. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +9 -14
  433. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
  434. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +3 -8
  435. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
  436. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
  437. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -6
  438. data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
  439. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -8
  440. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -8
  441. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
  442. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
  443. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
  444. data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
  445. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -8
  446. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
  447. data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
  448. data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
  449. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -6
  450. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +96 -30
  451. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -7
  452. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
  453. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
  454. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +127 -143
  455. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +2 -11
  456. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
  457. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
  458. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -6
  459. data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -6
  460. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
  461. data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
  462. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
  463. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -29
  464. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -6
  465. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
  466. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
  467. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +35 -30
  468. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
  469. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +2 -7
  470. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -6
  471. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
  472. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +7 -12
  473. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
  474. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
  475. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
  476. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
  477. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +28 -23
  478. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
  479. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +16 -9
  480. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
  481. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
  482. data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
  483. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
  484. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
  485. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
  486. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
  487. data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
  488. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
  489. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
  490. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
  491. data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -6
  492. data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
  493. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
  494. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
  495. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
  496. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
  497. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +1 -6
  498. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
  499. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
  500. data/ext/ice/cpp/src/IceUtil/Options.cpp +22 -12
  501. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -6
  502. data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -6
  503. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -7
  504. data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
  505. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -6
  506. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +42 -9
  507. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
  508. data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -6
  509. data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -6
  510. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
  511. data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
  512. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +13 -12
  513. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +58 -64
  514. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +2 -7
  515. data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
  516. data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
  517. data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
  518. data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
  519. data/ext/ice/cpp/src/Slice/Grammar.cpp +241 -245
  520. data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
  521. data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
  522. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +76 -86
  523. data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
  524. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
  525. data/ext/ice/cpp/src/Slice/MD5.h +1 -6
  526. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +6 -6
  527. data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
  528. data/ext/ice/cpp/src/Slice/Parser.cpp +86 -47
  529. data/ext/ice/cpp/src/Slice/Parser.h +6 -9
  530. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +11 -16
  531. data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -6
  532. data/ext/ice/cpp/src/Slice/Python.cpp +21 -27
  533. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +62 -35
  534. data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
  535. data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
  536. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +12 -14
  537. data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
  538. data/ext/ice/cpp/src/Slice/Scanner.cpp +101 -109
  539. data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
  540. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +1 -6
  541. data/ext/ice/cpp/src/Slice/Util.h +1 -6
  542. data/ice.gemspec +2 -4
  543. data/lib/Glacier2.rb +1 -6
  544. data/lib/Glacier2/Metrics.rb +3 -8
  545. data/lib/Glacier2/PermissionsVerifier.rb +3 -8
  546. data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
  547. data/lib/Glacier2/Router.rb +3 -8
  548. data/lib/Glacier2/RouterF.rb +3 -8
  549. data/lib/Glacier2/SSLInfo.rb +3 -8
  550. data/lib/Glacier2/Session.rb +3 -8
  551. data/lib/Ice.rb +1 -6
  552. data/lib/Ice/BuiltinSequences.rb +3 -8
  553. data/lib/Ice/Communicator.rb +3 -8
  554. data/lib/Ice/CommunicatorF.rb +3 -8
  555. data/lib/Ice/Connection.rb +3 -8
  556. data/lib/Ice/ConnectionF.rb +3 -8
  557. data/lib/Ice/Current.rb +3 -8
  558. data/lib/Ice/Endpoint.rb +3 -8
  559. data/lib/Ice/EndpointF.rb +3 -8
  560. data/lib/Ice/EndpointTypes.rb +3 -8
  561. data/lib/Ice/FacetMap.rb +3 -8
  562. data/lib/Ice/Identity.rb +3 -8
  563. data/lib/Ice/ImplicitContext.rb +3 -8
  564. data/lib/Ice/ImplicitContextF.rb +3 -8
  565. data/lib/Ice/Instrumentation.rb +3 -8
  566. data/lib/Ice/InstrumentationF.rb +3 -8
  567. data/lib/Ice/LocalException.rb +3 -8
  568. data/lib/Ice/Locator.rb +3 -8
  569. data/lib/Ice/LocatorF.rb +3 -8
  570. data/lib/Ice/Logger.rb +3 -8
  571. data/lib/Ice/LoggerF.rb +3 -8
  572. data/lib/Ice/Metrics.rb +3 -8
  573. data/lib/Ice/ObjectAdapter.rb +3 -8
  574. data/lib/Ice/ObjectAdapterF.rb +3 -8
  575. data/lib/Ice/ObjectFactory.rb +3 -8
  576. data/lib/Ice/Plugin.rb +3 -8
  577. data/lib/Ice/PluginF.rb +3 -8
  578. data/lib/Ice/Process.rb +3 -8
  579. data/lib/Ice/ProcessF.rb +3 -8
  580. data/lib/Ice/Properties.rb +3 -8
  581. data/lib/Ice/PropertiesAdmin.rb +3 -8
  582. data/lib/Ice/PropertiesF.rb +3 -8
  583. data/lib/Ice/RemoteLogger.rb +3 -8
  584. data/lib/Ice/Router.rb +3 -8
  585. data/lib/Ice/RouterF.rb +3 -8
  586. data/lib/Ice/ServantLocator.rb +3 -8
  587. data/lib/Ice/ServantLocatorF.rb +3 -8
  588. data/lib/Ice/SliceChecksumDict.rb +3 -8
  589. data/lib/Ice/ValueFactory.rb +3 -8
  590. data/lib/Ice/Version.rb +3 -8
  591. data/lib/IceBox.rb +1 -6
  592. data/lib/IceBox/IceBox.rb +3 -8
  593. data/lib/IceGrid.rb +1 -6
  594. data/lib/IceGrid/Admin.rb +3 -8
  595. data/lib/IceGrid/Descriptor.rb +3 -8
  596. data/lib/IceGrid/Exception.rb +3 -8
  597. data/lib/IceGrid/FileParser.rb +3 -8
  598. data/lib/IceGrid/PluginFacade.rb +3 -8
  599. data/lib/IceGrid/Registry.rb +3 -8
  600. data/lib/IceGrid/Session.rb +3 -8
  601. data/lib/IceGrid/UserAccountMapper.rb +3 -8
  602. data/lib/IcePatch2.rb +1 -6
  603. data/lib/IcePatch2/FileInfo.rb +3 -8
  604. data/lib/IcePatch2/FileServer.rb +3 -8
  605. data/lib/IceStorm.rb +1 -6
  606. data/lib/IceStorm/IceStorm.rb +3 -8
  607. data/lib/IceStorm/Metrics.rb +3 -8
  608. data/slice/Glacier2/Metrics.ice +13 -7
  609. data/slice/Glacier2/PermissionsVerifier.ice +11 -7
  610. data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
  611. data/slice/Glacier2/Router.ice +12 -8
  612. data/slice/Glacier2/RouterF.ice +11 -7
  613. data/slice/Glacier2/SSLInfo.ice +11 -7
  614. data/slice/Glacier2/Session.ice +11 -7
  615. data/slice/Ice/BuiltinSequences.ice +13 -7
  616. data/slice/Ice/Communicator.ice +42 -26
  617. data/slice/Ice/CommunicatorF.ice +13 -7
  618. data/slice/Ice/Connection.ice +21 -15
  619. data/slice/Ice/ConnectionF.ice +13 -7
  620. data/slice/Ice/Current.ice +28 -22
  621. data/slice/Ice/Endpoint.ice +17 -14
  622. data/slice/Ice/EndpointF.ice +13 -7
  623. data/slice/Ice/EndpointTypes.ice +15 -9
  624. data/slice/Ice/FacetMap.ice +13 -7
  625. data/slice/Ice/Identity.ice +13 -7
  626. data/slice/Ice/ImplicitContext.ice +22 -16
  627. data/slice/Ice/ImplicitContextF.ice +12 -7
  628. data/slice/Ice/Instrumentation.ice +13 -7
  629. data/slice/Ice/InstrumentationF.ice +13 -7
  630. data/slice/Ice/LocalException.ice +35 -29
  631. data/slice/Ice/Locator.ice +13 -7
  632. data/slice/Ice/LocatorF.ice +13 -7
  633. data/slice/Ice/Logger.ice +13 -7
  634. data/slice/Ice/LoggerF.ice +13 -7
  635. data/slice/Ice/Metrics.ice +14 -9
  636. data/slice/Ice/ObjectAdapter.ice +24 -18
  637. data/slice/Ice/ObjectAdapterF.ice +13 -7
  638. data/slice/Ice/ObjectFactory.ice +20 -12
  639. data/slice/Ice/Plugin.ice +17 -8
  640. data/slice/Ice/PluginF.ice +17 -7
  641. data/slice/Ice/Process.ice +13 -7
  642. data/slice/Ice/ProcessF.ice +13 -7
  643. data/slice/Ice/Properties.ice +25 -14
  644. data/slice/Ice/PropertiesAdmin.ice +13 -7
  645. data/slice/Ice/PropertiesF.ice +13 -7
  646. data/slice/Ice/RemoteLogger.ice +13 -7
  647. data/slice/Ice/Router.ice +14 -8
  648. data/slice/Ice/RouterF.ice +13 -7
  649. data/slice/Ice/ServantLocator.ice +27 -21
  650. data/slice/Ice/ServantLocatorF.ice +13 -7
  651. data/slice/Ice/SliceChecksumDict.ice +13 -7
  652. data/slice/Ice/ValueFactory.ice +19 -12
  653. data/slice/Ice/Version.ice +13 -7
  654. data/slice/IceBT/ConnectionInfo.ice +12 -7
  655. data/slice/IceBT/EndpointInfo.ice +12 -7
  656. data/slice/IceBT/Types.ice +12 -7
  657. data/slice/IceBox/IceBox.ice +12 -7
  658. data/slice/IceDiscovery/IceDiscovery.ice +12 -7
  659. data/slice/IceGrid/Admin.ice +41 -35
  660. data/slice/IceGrid/Descriptor.ice +15 -10
  661. data/slice/IceGrid/Exception.ice +15 -10
  662. data/slice/IceGrid/FileParser.ice +14 -8
  663. data/slice/IceGrid/PluginFacade.ice +13 -7
  664. data/slice/IceGrid/Registry.ice +13 -7
  665. data/slice/IceGrid/Session.ice +18 -12
  666. data/slice/IceGrid/UserAccountMapper.ice +16 -10
  667. data/slice/IceIAP/ConnectionInfo.ice +10 -7
  668. data/slice/IceIAP/EndpointInfo.ice +10 -7
  669. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
  670. data/slice/IcePatch2/FileInfo.ice +12 -7
  671. data/slice/IcePatch2/FileServer.ice +13 -8
  672. data/slice/IceSSL/ConnectionInfo.ice +13 -7
  673. data/slice/IceSSL/ConnectionInfoF.ice +13 -7
  674. data/slice/IceSSL/EndpointInfo.ice +13 -7
  675. data/slice/IceStorm/IceStorm.ice +17 -11
  676. data/slice/IceStorm/Metrics.ice +12 -8
  677. metadata +4 -2
@@ -1,15 +1,21 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
7
+ [["cpp:dll-export:ICE_API"]]
8
+ [["cpp:doxygen:include:Ice/Ice.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:dll-export:ICE_API"]]
16
+ [["objc:header-dir:objc"]]
17
+
18
+ [["python:pkgdir:Ice"]]
13
19
 
14
20
  #ifndef __SLICE2JAVA_COMPAT__
15
21
  [["java:package:com.zeroc"]]
@@ -1,15 +1,21 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
7
+ [["cpp:dll-export:ICE_API"]]
8
+ [["cpp:doxygen:include:Ice/Ice.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:dll-export:ICE_API"]]
16
+ [["objc:header-dir:objc"]]
17
+
18
+ [["python:pkgdir:Ice"]]
13
19
 
14
20
  #include <Ice/ObjectAdapterF.ice>
15
21
  #include <Ice/Current.ice>
@@ -42,25 +48,25 @@ local interface ServantLocator
42
48
  * the returned servant into its active servant map. This must be
43
49
  * done by the servant locator implementation, if this is desired.
44
50
  *
45
- * <tt>locate</tt> can throw any user exception. If it does, that exception
51
+ * <code>locate</code> can throw any user exception. If it does, that exception
46
52
  * is marshaled back to the client. If the Slice definition for the
47
53
  * corresponding operation includes that user exception, the client
48
54
  * receives that user exception; otherwise, the client receives
49
55
  * {@link UnknownUserException}.
50
56
  *
51
- * If <tt>locate</tt> throws any exception, the Ice run time does <em>not</em>
52
- * call <tt>finished</tt>.
57
+ * If <code>locate</code> throws any exception, the Ice run time does <em>not</em>
58
+ * call <code>finished</code>.
53
59
  *
54
- * <p class="Note">If you call <tt>locate</tt> from your own code, you
55
- * must also call <tt>finished</tt> when you have finished using the
56
- * servant, provided that <tt>locate</tt> returned a non-null servant;
60
+ * <p class="Note">If you call <code>locate</code> from your own code, you
61
+ * must also call <code>finished</code> when you have finished using the
62
+ * servant, provided that <code>locate</code> returned a non-null servant;
57
63
  * otherwise, you will get undefined behavior if you use
58
64
  * servant locators such as the Freeze Evictor.
59
65
  *
60
66
  * @param curr Information about the current operation for which
61
67
  * a servant is required.
62
68
  *
63
- * @param cookie A "cookie" that will be passed to <tt>finished</tt>.
69
+ * @param cookie A "cookie" that will be passed to <code>finished</code>.
64
70
  *
65
71
  * @return The located servant, or null if no suitable servant has
66
72
  * been found.
@@ -78,25 +84,25 @@ local interface ServantLocator
78
84
  /**
79
85
  *
80
86
  * Called by the object adapter after a request has been
81
- * made. This operation is only called if <tt>locate</tt> was called
87
+ * made. This operation is only called if <code>locate</code> was called
82
88
  * prior to the request and returned a non-null servant. This
83
89
  * operation can be used for cleanup purposes after a request.
84
90
  *
85
- * <tt>finished</tt> can throw any user exception. If it does, that exception
91
+ * <code>finished</code> can throw any user exception. If it does, that exception
86
92
  * is marshaled back to the client. If the Slice definition for the
87
93
  * corresponding operation includes that user exception, the client
88
94
  * receives that user exception; otherwise, the client receives
89
95
  * {@link UnknownUserException}.
90
96
  *
91
- * If both the operation and <tt>finished</tt> throw an exception, the
92
- * exception thrown by <tt>finished</tt> is marshaled back to the client.
97
+ * If both the operation and <code>finished</code> throw an exception, the
98
+ * exception thrown by <code>finished</code> is marshaled back to the client.
93
99
  *
94
100
  * @param curr Information about the current operation call for
95
- * which a servant was located by <tt>locate</tt>.
101
+ * which a servant was located by <code>locate</code>.
96
102
  *
97
- * @param servant The servant that was returned by <tt>locate</tt>.
103
+ * @param servant The servant that was returned by <code>locate</code>.
98
104
  *
99
- * @param cookie The cookie that was returned by <tt>locate</tt>.
105
+ * @param cookie The cookie that was returned by <code>locate</code>.
100
106
  *
101
107
  * @throws UserException The implementation can raise a UserException
102
108
  * and the run time will marshal it as the result of the invocation.
@@ -1,15 +1,21 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
7
+ [["cpp:dll-export:ICE_API"]]
8
+ [["cpp:doxygen:include:Ice/Ice.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:dll-export:ICE_API"]]
16
+ [["objc:header-dir:objc"]]
17
+
18
+ [["python:pkgdir:Ice"]]
13
19
 
14
20
  #ifndef __SLICE2JAVA_COMPAT__
15
21
  [["java:package:com.zeroc"]]
@@ -1,15 +1,21 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
7
+ [["cpp:dll-export:ICE_API"]]
8
+ [["cpp:doxygen:include:Ice/Ice.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:dll-export:ICE_API"]]
16
+ [["objc:header-dir:objc"]]
17
+
18
+ [["python:pkgdir:Ice"]]
13
19
 
14
20
  #ifndef __SLICE2JAVA_COMPAT__
15
21
  [["java:package:com.zeroc"]]
@@ -1,15 +1,21 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
7
+ [["cpp:dll-export:ICE_API"]]
8
+ [["cpp:doxygen:include:Ice/Ice.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:dll-export:ICE_API"]]
16
+ [["objc:header-dir:objc"]]
17
+
18
+ [["python:pkgdir:Ice"]]
13
19
 
14
20
  #ifndef __SLICE2JAVA_COMPAT__
15
21
  [["java:package:com.zeroc"]]
@@ -19,6 +25,7 @@
19
25
  module Ice
20
26
  {
21
27
 
28
+ #if !defined(__SLICE2PHP__)
22
29
  /**
23
30
  *
24
31
  * A factory for values. Value factories are used in several
@@ -28,7 +35,7 @@ module Ice
28
35
  * with the communicator.
29
36
  *
30
37
  **/
31
- ["delegate", "php:internal"]
38
+ ["delegate"]
32
39
  local interface ValueFactory
33
40
  {
34
41
  /**
@@ -36,10 +43,10 @@ local interface ValueFactory
36
43
  * Create a new value for a given value type. The type is the
37
44
  * absolute Slice type id, i.e., the id relative to the
38
45
  * unnamed top-level Slice module. For example, the absolute
39
- * Slice type id for an interface <tt>Bar</tt> in the module
40
- * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
46
+ * Slice type id for an interface <code>Bar</code> in the module
47
+ * <code>Foo</code> is <code>"::Foo::Bar"</code>.
41
48
  *
42
- * Note that the leading "<tt>::</tt>" is required.
49
+ * Note that the leading "<code>::</code>" is required.
43
50
  *
44
51
  * @param type The value type.
45
52
  *
@@ -59,7 +66,6 @@ local interface ValueFactory
59
66
  * @see ValueFactory
60
67
  *
61
68
  **/
62
- ["php:internal"]
63
69
  local interface ValueFactoryManager
64
70
  {
65
71
  /**
@@ -121,5 +127,6 @@ local interface ValueFactoryManager
121
127
  **/
122
128
  ["cpp:const", "cpp:noexcept"] ValueFactory find(string id);
123
129
  }
130
+ #endif
124
131
 
125
132
  }
@@ -1,15 +1,21 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
7
+ [["cpp:dll-export:ICE_API"]]
8
+ [["cpp:doxygen:include:Ice/Ice.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:dll-export:ICE_API"]]
16
+ [["objc:header-dir:objc"]]
17
+
18
+ [["python:pkgdir:Ice"]]
13
19
 
14
20
  #ifndef __SLICE2JAVA_COMPAT__
15
21
  [["java:package:com.zeroc"]]
@@ -1,15 +1,20 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
7
+ [["cpp:dll-export:ICEBT_API"]]
8
+ [["cpp:doxygen:include:IceBT/IceBT.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:header-dir:objc"]]
16
+
17
+ [["python:pkgdir:IceBT"]]
13
18
 
14
19
  #include <Ice/Connection.ice>
15
20
 
@@ -1,15 +1,20 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceBT"]]
7
+ [["cpp:dll-export:ICEBT_API"]]
8
+ [["cpp:doxygen:include:IceBT/IceBT.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:header-dir:objc"]]
16
+
17
+ [["python:pkgdir:IceBT"]]
13
18
 
14
19
  #include <Ice/Endpoint.ice>
15
20
 
@@ -1,15 +1,20 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
7
+ [["cpp:dll-export:ICEBT_API"]]
8
+ [["cpp:doxygen:include:IceBT/IceBT.h"]]
9
+ [["cpp:header-ext:h"]]
10
+
11
+ [["ice-prefix"]]
12
+
13
+ [["js:module:ice"]]
14
+
15
+ [["objc:header-dir:objc"]]
16
+
17
+ [["python:pkgdir:IceBT"]]
13
18
 
14
19
  #ifndef __SLICE2JAVA_COMPAT__
15
20
  [["java:package:com.zeroc"]]
@@ -1,17 +1,22 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBOX_API", "cpp:doxygen:include:IceBox/IceBox.h", "objc:header-dir:objc", "python:pkgdir:IceBox"]]
7
+ [["cpp:dll-export:ICEBOX_API"]]
8
+ [["cpp:doxygen:include:IceBox/IceBox.h"]]
9
+ [["cpp:header-ext:h"]]
13
10
  [["cpp:include:IceBox/Config.h"]]
14
11
 
12
+ [["ice-prefix"]]
13
+
14
+ [["js:module:ice"]]
15
+
16
+ [["objc:header-dir:objc"]]
17
+
18
+ [["python:pkgdir:IceBox"]]
19
+
15
20
  #include <Ice/BuiltinSequences.ice>
16
21
  #include <Ice/CommunicatorF.ice>
17
22
  #include <Ice/PropertiesF.ice>
@@ -1,14 +1,19 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
- [["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceDiscovery/IceDiscovery.h", "objc:header-dir:objc", "python:pkgdir:IceDiscovery"]]
6
+
7
+ [["cpp:doxygen:include:IceDiscovery/IceDiscovery.h"]]
8
+ [["cpp:header-ext:h"]]
9
+
10
+ [["ice-prefix"]]
11
+
12
+ [["js:module:ice"]]
13
+
14
+ [["objc:header-dir:objc"]]
15
+
16
+ [["python:pkgdir:IceDiscovery"]]
12
17
 
13
18
  #include <Ice/Identity.ice>
14
19
 
@@ -1,17 +1,23 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
- //
8
- // **********************************************************************
9
4
 
10
5
  #pragma once
11
6
 
12
- [["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
7
+ [["cpp:dll-export:ICEGRID_API"]]
8
+ [["cpp:doxygen:include:IceGrid/IceGrid.h"]]
9
+ [["cpp:header-ext:h"]]
13
10
  [["cpp:include:IceGrid/Config.h"]]
14
11
 
12
+ [["ice-prefix"]]
13
+
14
+ [["js:module:ice"]]
15
+
16
+ [["objc:dll-export:ICEGRID_API"]]
17
+ [["objc:header-dir:objc"]]
18
+
19
+ [["python:pkgdir:IceGrid"]]
20
+
15
21
  #include <Ice/Identity.ice>
16
22
  #include <Ice/BuiltinSequences.ice>
17
23
  #include <Ice/Properties.ice>
@@ -882,7 +888,7 @@ interface Admin
882
888
  /**
883
889
  *
884
890
  * Add an object to the object registry. IceGrid will get the
885
- * object type by calling <tt>ice_id</tt> on the given proxy. The object
891
+ * object type by calling <code>ice_id</code> on the given proxy. The object
886
892
  * must be reachable.
887
893
  *
888
894
  * @param obj The object to be added to the registry.
@@ -991,7 +997,7 @@ interface Admin
991
997
  *
992
998
  * @param expr The expression to match against the stringified
993
999
  * identities of registered objects. The expression may contain
994
- * a trailing wildcard (<tt>*</tt>) character.
1000
+ * a trailing wildcard (<code>*</code>) character.
995
1001
  *
996
1002
  * @return All the object infos with a stringified identity
997
1003
  * matching the given expression.
@@ -1364,7 +1370,7 @@ interface RegistryObserver
1364
1370
  {
1365
1371
  /**
1366
1372
  *
1367
- * The <tt>registryInit</tt> operation is called after registration of
1373
+ * The <code>registryInit</code> operation is called after registration of
1368
1374
  * an observer to indicate the state of the registries.
1369
1375
  *
1370
1376
  * @param registries The current state of the registries.
@@ -1374,7 +1380,7 @@ interface RegistryObserver
1374
1380
 
1375
1381
  /**
1376
1382
  *
1377
- * The <tt>nodeUp</tt> operation is called to notify an observer that a node
1383
+ * The <code>nodeUp</code> operation is called to notify an observer that a node
1378
1384
  * came up.
1379
1385
  *
1380
1386
  * @param node The node state.
@@ -1384,7 +1390,7 @@ interface RegistryObserver
1384
1390
 
1385
1391
  /**
1386
1392
  *
1387
- * The <tt>nodeDown</tt> operation is called to notify an observer that a node
1393
+ * The <code>nodeDown</code> operation is called to notify an observer that a node
1388
1394
  * went down.
1389
1395
  *
1390
1396
  * @param name The node name.
@@ -1411,7 +1417,7 @@ interface NodeObserver
1411
1417
  {
1412
1418
  /**
1413
1419
  *
1414
- * The <tt>nodeInit</tt> operation indicates the current state
1420
+ * The <code>nodeInit</code> operation indicates the current state
1415
1421
  * of nodes. It is called after the registration of an observer.
1416
1422
  *
1417
1423
  * @param nodes The current state of the nodes.
@@ -1421,7 +1427,7 @@ interface NodeObserver
1421
1427
 
1422
1428
  /**
1423
1429
  *
1424
- * The <tt>nodeUp</tt> operation is called to notify an observer that a node
1430
+ * The <code>nodeUp</code> operation is called to notify an observer that a node
1425
1431
  * came up.
1426
1432
  *
1427
1433
  * @param node The node state.
@@ -1431,7 +1437,7 @@ interface NodeObserver
1431
1437
 
1432
1438
  /**
1433
1439
  *
1434
- * The <tt>nodeDown</tt> operation is called to notify an observer that a node
1440
+ * The <code>nodeDown</code> operation is called to notify an observer that a node
1435
1441
  * went down.
1436
1442
  *
1437
1443
  * @param name The node name.
@@ -1441,7 +1447,7 @@ interface NodeObserver
1441
1447
 
1442
1448
  /**
1443
1449
  *
1444
- * The <tt>updateServer</tt> operation is called to notify an observer that
1450
+ * The <code>updateServer</code> operation is called to notify an observer that
1445
1451
  * the state of a server changed.
1446
1452
  *
1447
1453
  * @param node The node hosting the server.
@@ -1453,7 +1459,7 @@ interface NodeObserver
1453
1459
 
1454
1460
  /**
1455
1461
  *
1456
- * The <tt>updateAdapter</tt> operation is called to notify an observer that
1462
+ * The <code>updateAdapter</code> operation is called to notify an observer that
1457
1463
  * the state of an adapter changed.
1458
1464
  *
1459
1465
  * @param node The node hosting the adapter.
@@ -1475,7 +1481,7 @@ interface ApplicationObserver
1475
1481
  {
1476
1482
  /**
1477
1483
  *
1478
- * <tt>applicationInit</tt> is called after the registration
1484
+ * <code>applicationInit</code> is called after the registration
1479
1485
  * of an observer to indicate the state of the registry.
1480
1486
  *
1481
1487
  * @param serial The current serial number of the registry
@@ -1490,7 +1496,7 @@ interface ApplicationObserver
1490
1496
 
1491
1497
  /**
1492
1498
  *
1493
- * The <tt>applicationAdded</tt> operation is called to notify an observer
1499
+ * The <code>applicationAdded</code> operation is called to notify an observer
1494
1500
  * that an application was added.
1495
1501
  *
1496
1502
  * @param serial The new serial number of the registry database.
@@ -1502,7 +1508,7 @@ interface ApplicationObserver
1502
1508
 
1503
1509
  /**
1504
1510
  *
1505
- * The <tt>applicationRemoved</tt> operation is called to notify an observer
1511
+ * The <code>applicationRemoved</code> operation is called to notify an observer
1506
1512
  * that an application was removed.
1507
1513
  *
1508
1514
  * @param serial The new serial number of the registry database.
@@ -1514,7 +1520,7 @@ interface ApplicationObserver
1514
1520
 
1515
1521
  /**
1516
1522
  *
1517
- * The <tt>applicationUpdated</tt> operation is called to notify an observer
1523
+ * The <code>applicationUpdated</code> operation is called to notify an observer
1518
1524
  * that an application was updated.
1519
1525
  *
1520
1526
  * @param serial The new serial number of the registry database.
@@ -1535,7 +1541,7 @@ interface AdapterObserver
1535
1541
  {
1536
1542
  /**
1537
1543
  *
1538
- * <tt>adapterInit</tt> is called after registration of
1544
+ * <code>adapterInit</code> is called after registration of
1539
1545
  * an observer to indicate the state of the registry.
1540
1546
  *
1541
1547
  * @param adpts The adapters that were dynamically registered
@@ -1546,7 +1552,7 @@ interface AdapterObserver
1546
1552
 
1547
1553
  /**
1548
1554
  *
1549
- * The <tt>adapterAdded</tt> operation is called to notify an observer when
1555
+ * The <code>adapterAdded</code> operation is called to notify an observer when
1550
1556
  * a dynamically-registered adapter was added.
1551
1557
  *
1552
1558
  * @param info The details of the new adapter.
@@ -1583,7 +1589,7 @@ interface ObjectObserver
1583
1589
  {
1584
1590
  /**
1585
1591
  *
1586
- * <tt>objectInit</tt> is called after the registration of
1592
+ * <code>objectInit</code> is called after the registration of
1587
1593
  * an observer to indicate the state of the registry.
1588
1594
  *
1589
1595
  * @param objects The objects registered with the {@link Admin}
@@ -1594,7 +1600,7 @@ interface ObjectObserver
1594
1600
 
1595
1601
  /**
1596
1602
  *
1597
- * The <tt>objectAdded</tt> operation is called to notify an observer when an
1603
+ * The <code>objectAdded</code> operation is called to notify an observer when an
1598
1604
  * object was added to the {@link Admin} interface.
1599
1605
  *
1600
1606
  * @param info The details of the added object.
@@ -1604,7 +1610,7 @@ interface ObjectObserver
1604
1610
 
1605
1611
  /**
1606
1612
  *
1607
- * <tt>objectUpdated</tt> is called to notify an observer when
1613
+ * <code>objectUpdated</code> is called to notify an observer when
1608
1614
  * an object registered with the {@link Admin} interface was updated.
1609
1615
  *
1610
1616
  * @param info The details of the updated object.
@@ -1614,7 +1620,7 @@ interface ObjectObserver
1614
1620
 
1615
1621
  /**
1616
1622
  *
1617
- * <tt>objectRemoved</tt> is called to notify an observer when
1623
+ * <code>objectRemoved</code> is called to notify an observer when
1618
1624
  * an object registered with the {@link Admin} interface was removed.
1619
1625
  *
1620
1626
  * @param id The identity of the removed object.
@@ -1628,7 +1634,7 @@ interface ObjectObserver
1628
1634
  * Used by administrative clients to view,
1629
1635
  * update, and receive observer updates from the IceGrid
1630
1636
  * registry. Admin sessions are created either via the {@link Registry}
1631
- * object or via the registry admin <tt>SessionManager</tt> object.
1637
+ * object or via the registry admin <code>SessionManager</code> object.
1632
1638
  *
1633
1639
  * @see Registry
1634
1640
  *
@@ -1765,7 +1771,7 @@ interface AdminSession extends Glacier2::Session
1765
1771
  *
1766
1772
  * @param count Specifies where to start reading the file. If
1767
1773
  * negative, the file is read from the begining. If 0 or positive,
1768
- * the file is read from the last <tt>count</tt> lines.
1774
+ * the file is read from the last <code>count</code> lines.
1769
1775
  *
1770
1776
  * @return An iterator to read the file.
1771
1777
  *
@@ -1794,7 +1800,7 @@ interface AdminSession extends Glacier2::Session
1794
1800
  *
1795
1801
  * @param count Specifies where to start reading the file. If
1796
1802
  * negative, the file is read from the begining. If 0 or positive,
1797
- * the file is read from the last <tt>count</tt> lines.
1803
+ * the file is read from the last <code>count</code> lines.
1798
1804
  *
1799
1805
  * @return An iterator to read the file.
1800
1806
  *
@@ -1823,7 +1829,7 @@ interface AdminSession extends Glacier2::Session
1823
1829
  *
1824
1830
  * @param count Specifies where to start reading the file. If
1825
1831
  * negative, the file is read from the begining. If 0 or positive,
1826
- * the file is read from the last <tt>count</tt> lines.
1832
+ * the file is read from the last <code>count</code> lines.
1827
1833
  *
1828
1834
  * @return An iterator to read the file.
1829
1835
  *
@@ -1852,7 +1858,7 @@ interface AdminSession extends Glacier2::Session
1852
1858
  *
1853
1859
  * @param count Specifies where to start reading the file. If
1854
1860
  * negative, the file is read from the begining. If 0 or positive,
1855
- * the file is read from the last <tt>count</tt> lines.
1861
+ * the file is read from the last <code>count</code> lines.
1856
1862
  *
1857
1863
  * @return An iterator to read the file.
1858
1864
  *
@@ -1877,7 +1883,7 @@ interface AdminSession extends Glacier2::Session
1877
1883
  *
1878
1884
  * @param count Specifies where to start reading the file. If
1879
1885
  * negative, the file is read from the begining. If 0 or positive,
1880
- * the file is read from the last <tt>count</tt> lines.
1886
+ * the file is read from the last <code>count</code> lines.
1881
1887
  *
1882
1888
  * @return An iterator to read the file.
1883
1889
  *
@@ -1902,7 +1908,7 @@ interface AdminSession extends Glacier2::Session
1902
1908
  *
1903
1909
  * @param count Specifies where to start reading the file. If
1904
1910
  * negative, the file is read from the begining. If 0 or positive,
1905
- * the file is read from the last <tt>count</tt> lines.
1911
+ * the file is read from the last <code>count</code> lines.
1906
1912
  *
1907
1913
  * @return An iterator to read the file.
1908
1914
  *
@@ -1928,7 +1934,7 @@ interface AdminSession extends Glacier2::Session
1928
1934
  *
1929
1935
  * @param count Specifies where to start reading the file. If
1930
1936
  * negative, the file is read from the begining. If 0 or positive,
1931
- * the file is read from the last <tt>count</tt> lines.
1937
+ * the file is read from the last <code>count</code> lines.
1932
1938
  *
1933
1939
  * @return An iterator to read the file.
1934
1940
  *