zeroc-ice 3.6.5 → 3.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (752) hide show
  1. checksums.yaml +4 -4
  2. data/BZIP2_LICENSE +42 -0
  3. data/ICE_LICENSE +17 -17
  4. data/LICENSE +12 -12
  5. data/bin/slice2rb +1 -1
  6. data/ext/Communicator.cpp +150 -53
  7. data/ext/Communicator.h +1 -1
  8. data/ext/Config.h +2 -12
  9. data/ext/Connection.cpp +89 -68
  10. data/ext/Connection.h +1 -1
  11. data/ext/Endpoint.cpp +16 -45
  12. data/ext/Endpoint.h +1 -1
  13. data/ext/ImplicitContext.cpp +1 -5
  14. data/ext/ImplicitContext.h +1 -1
  15. data/ext/Init.cpp +4 -1
  16. data/ext/Logger.cpp +1 -1
  17. data/ext/Logger.h +1 -1
  18. data/ext/Operation.cpp +33 -44
  19. data/ext/Operation.h +1 -1
  20. data/ext/Properties.cpp +1 -1
  21. data/ext/Properties.h +1 -1
  22. data/ext/Proxy.cpp +22 -57
  23. data/ext/Proxy.h +1 -1
  24. data/ext/Slice.cpp +5 -5
  25. data/ext/Slice.h +1 -1
  26. data/ext/Types.cpp +244 -171
  27. data/ext/Types.h +118 -66
  28. data/ext/Util.cpp +13 -9
  29. data/ext/Util.h +10 -10
  30. data/ext/ValueFactoryManager.cpp +445 -0
  31. data/ext/ValueFactoryManager.h +100 -0
  32. data/ext/extconf.rb +47 -45
  33. data/ext/ice/bzip2/blocksort.c +1094 -0
  34. data/ext/ice/bzip2/bzlib.c +1572 -0
  35. data/ext/ice/bzip2/bzlib.h +282 -0
  36. data/ext/ice/bzip2/bzlib_private.h +509 -0
  37. data/ext/ice/bzip2/compress.c +672 -0
  38. data/ext/ice/bzip2/crctable.c +104 -0
  39. data/ext/ice/bzip2/decompress.c +646 -0
  40. data/ext/ice/bzip2/huffman.c +205 -0
  41. data/ext/ice/bzip2/randtable.c +84 -0
  42. data/ext/ice/cpp/include/Ice/Application.h +77 -60
  43. data/ext/ice/cpp/include/Ice/AsyncResult.h +34 -318
  44. data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -2
  45. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +5 -10
  46. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
  47. data/ext/ice/cpp/include/Ice/Buffer.h +10 -10
  48. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +14 -12
  49. data/ext/ice/cpp/include/Ice/Comparable.h +130 -0
  50. data/ext/ice/cpp/include/Ice/Config.h +7 -36
  51. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +107 -11
  52. data/ext/ice/cpp/include/Ice/ConnectionIF.h +5 -1
  53. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +28 -0
  54. data/ext/ice/cpp/include/Ice/{DefaultObjectFactory.h → DefaultValueFactory.h} +28 -14
  55. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +4 -6
  56. data/ext/ice/cpp/include/Ice/Dispatcher.h +14 -13
  57. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -5
  58. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
  59. data/ext/ice/cpp/include/Ice/Exception.h +66 -56
  60. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +69 -0
  61. data/ext/ice/cpp/include/Ice/FactoryTable.h +11 -12
  62. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +27 -25
  63. data/ext/ice/cpp/include/Ice/Format.h +6 -1
  64. data/ext/ice/cpp/include/Ice/Functional.h +33 -33
  65. data/ext/ice/cpp/include/Ice/GCObject.h +9 -5
  66. data/ext/ice/cpp/include/Ice/Handle.h +6 -11
  67. data/ext/ice/cpp/include/Ice/Ice.h +9 -5
  68. data/ext/ice/cpp/include/{IceUtil → Ice}/IconvStringConverter.h +108 -62
  69. data/ext/ice/cpp/include/Ice/Incoming.h +109 -33
  70. data/ext/ice/cpp/include/Ice/IncomingAsync.h +63 -23
  71. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -1
  72. data/ext/ice/cpp/include/Ice/Initialize.h +178 -38
  73. data/ext/ice/cpp/include/Ice/InputStream.h +994 -0
  74. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -2
  75. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +46 -0
  76. data/ext/ice/cpp/include/Ice/LocalObject.h +9 -9
  77. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
  78. data/ext/ice/cpp/include/Ice/LoggerUtil.h +20 -14
  79. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +114 -65
  80. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +23 -5
  81. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +99 -26
  82. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +17 -4
  83. data/ext/ice/cpp/include/Ice/Object.h +105 -56
  84. data/ext/ice/cpp/include/Ice/ObjectF.h +8 -3
  85. data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -8
  86. data/ext/ice/cpp/include/Ice/Optional.h +1084 -0
  87. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +655 -84
  88. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -6
  89. data/ext/ice/cpp/include/Ice/OutputStream.h +753 -0
  90. data/ext/ice/cpp/include/Ice/Protocol.h +19 -12
  91. data/ext/ice/cpp/include/Ice/Proxy.h +1329 -717
  92. data/ext/ice/cpp/include/Ice/ProxyF.h +11 -33
  93. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
  94. data/ext/ice/cpp/include/Ice/ProxyHandle.h +34 -50
  95. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
  96. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +22 -3
  97. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -4
  98. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -1
  99. data/ext/ice/cpp/include/{IceUtil → Ice}/SHA1.h +16 -16
  100. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
  101. data/ext/ice/cpp/include/Ice/Service.h +13 -18
  102. data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
  103. data/ext/ice/cpp/include/Ice/SlicedData.h +46 -20
  104. data/ext/ice/cpp/include/Ice/SlicedDataF.h +14 -6
  105. data/ext/ice/cpp/include/Ice/StreamHelpers.h +159 -49
  106. data/ext/ice/cpp/include/Ice/StringConverter.h +52 -0
  107. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
  108. data/{slice/Ice/ObjectFactoryF.ice → ext/ice/cpp/include/Ice/UUID.h} +9 -7
  109. data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +21 -22
  110. data/ext/ice/cpp/include/Ice/UniqueRef.h +98 -0
  111. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +40 -8
  112. data/ext/ice/cpp/include/Ice/Value.h +104 -0
  113. data/{slice/Freeze/ConnectionF.ice → ext/ice/cpp/include/Ice/ValueF.h} +11 -7
  114. data/ext/ice/cpp/include/IceSSL/Config.h +8 -23
  115. data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -6
  116. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +130 -0
  117. data/ext/ice/cpp/include/IceSSL/Plugin.h +172 -259
  118. data/ext/ice/cpp/include/IceSSL/SChannel.h +66 -0
  119. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +66 -0
  120. data/ext/ice/cpp/include/IceSSL/UWP.h +58 -0
  121. data/ext/ice/cpp/include/IceUtil/Atomic.h +8 -10
  122. data/ext/ice/cpp/include/IceUtil/Cond.h +17 -18
  123. data/ext/ice/cpp/include/IceUtil/Config.h +138 -39
  124. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +97 -0
  125. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -5
  126. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +23 -17
  127. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -3
  128. data/ext/ice/cpp/include/IceUtil/Exception.h +157 -67
  129. data/ext/ice/cpp/include/IceUtil/FileUtil.h +148 -0
  130. data/ext/ice/cpp/include/IceUtil/Functional.h +1 -2
  131. data/ext/ice/cpp/include/IceUtil/Handle.h +11 -11
  132. data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -10
  133. data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -3
  134. data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -2
  135. data/ext/ice/cpp/include/IceUtil/Lock.h +8 -10
  136. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -2
  137. data/ext/ice/cpp/include/IceUtil/Mutex.h +17 -11
  138. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -2
  139. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
  140. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -4
  141. data/ext/ice/cpp/include/IceUtil/Optional.h +32 -18
  142. data/ext/ice/cpp/include/IceUtil/Options.h +17 -18
  143. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +55 -29
  144. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -6
  145. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +11 -10
  146. data/ext/ice/cpp/include/IceUtil/Random.h +3 -3
  147. data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -8
  148. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +58 -0
  149. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +1 -9
  150. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -2
  151. data/ext/ice/cpp/include/IceUtil/Shared.h +5 -7
  152. data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -2
  153. data/ext/ice/cpp/include/IceUtil/StringConverter.h +77 -72
  154. data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -21
  155. data/ext/ice/cpp/include/IceUtil/Thread.h +10 -12
  156. data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -42
  157. data/ext/ice/cpp/include/IceUtil/Time.h +3 -3
  158. data/ext/ice/cpp/include/IceUtil/Timer.h +14 -13
  159. data/ext/ice/cpp/include/IceUtil/UUID.h +2 -2
  160. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
  161. data/ext/ice/cpp/include/{Ice → generated/Ice}/BuiltinSequences.h +41 -8
  162. data/ext/ice/cpp/include/generated/Ice/Communicator.h +364 -0
  163. data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +40 -8
  164. data/ext/ice/cpp/include/generated/Ice/Connection.h +872 -0
  165. data/ext/ice/cpp/include/{Ice → generated/Ice}/ConnectionF.h +46 -8
  166. data/ext/ice/cpp/include/{Ice → generated/Ice}/Current.h +71 -8
  167. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +582 -0
  168. data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointF.h +62 -8
  169. data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointTypes.h +31 -16
  170. data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +23 -8
  171. data/ext/ice/cpp/include/generated/Ice/Identity.h +221 -0
  172. data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContext.h +72 -13
  173. data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +40 -8
  174. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +602 -0
  175. data/ext/ice/cpp/include/{Ice → generated/Ice}/InstrumentationF.h +54 -8
  176. data/ext/ice/cpp/include/generated/Ice/LocalException.h +2802 -0
  177. data/ext/ice/cpp/include/generated/Ice/Locator.h +2036 -0
  178. data/ext/ice/cpp/include/{Ice → generated/Ice}/LocatorF.h +53 -12
  179. data/ext/ice/cpp/include/{Ice → generated/Ice}/Logger.h +71 -13
  180. data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +40 -8
  181. data/ext/ice/cpp/include/generated/Ice/Metrics.h +2649 -0
  182. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +302 -0
  183. data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +40 -8
  184. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +142 -0
  185. data/ext/ice/cpp/include/generated/Ice/Plugin.h +197 -0
  186. data/ext/ice/cpp/include/{Ice → generated/Ice}/PluginF.h +43 -8
  187. data/ext/ice/cpp/include/generated/Ice/Process.h +536 -0
  188. data/ext/ice/cpp/include/{Ice → generated/Ice}/ProcessF.h +45 -10
  189. data/ext/ice/cpp/include/{Ice → generated/Ice}/Properties.h +88 -21
  190. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +749 -0
  191. data/ext/ice/cpp/include/{Ice → generated/Ice}/PropertiesF.h +48 -10
  192. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1449 -0
  193. data/ext/ice/cpp/include/generated/Ice/Router.h +1032 -0
  194. data/ext/ice/cpp/include/{Ice → generated/Ice}/RouterF.h +45 -10
  195. data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocator.h +65 -13
  196. data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +40 -8
  197. data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +23 -8
  198. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +169 -0
  199. data/ext/ice/cpp/include/generated/Ice/Version.h +334 -0
  200. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +172 -0
  201. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +98 -0
  202. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +156 -0
  203. data/ext/ice/cpp/src/Ice/ACM.cpp +18 -14
  204. data/ext/ice/cpp/src/Ice/ACM.h +9 -2
  205. data/ext/ice/cpp/{include → src}/Ice/ACMF.h +10 -5
  206. data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -1
  207. data/ext/ice/cpp/src/Ice/Acceptor.h +4 -3
  208. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
  209. data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.cpp +9 -9
  210. data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.h +7 -7
  211. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -538
  212. data/ext/ice/cpp/src/Ice/Base64.cpp +11 -11
  213. data/ext/ice/cpp/src/Ice/Base64.h +1 -1
  214. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +40 -12
  215. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -10
  216. data/ext/ice/cpp/src/Ice/Buffer.cpp +74 -12
  217. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +20 -6
  218. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +85 -190
  219. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -18
  220. data/ext/ice/cpp/src/Ice/Communicator.cpp +39 -8
  221. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +27 -5
  222. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +271 -104
  223. data/ext/ice/cpp/src/Ice/CommunicatorI.h +84 -28
  224. data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -3
  225. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +58 -125
  226. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +11 -22
  227. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -2
  228. data/ext/ice/cpp/src/Ice/Connection.cpp +88 -8
  229. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +27 -5
  230. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +158 -80
  231. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +41 -23
  232. data/ext/ice/cpp/{include → src}/Ice/ConnectionFactoryF.h +8 -3
  233. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +707 -653
  234. data/ext/ice/cpp/src/Ice/ConnectionI.h +97 -69
  235. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -15
  236. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +4 -3
  237. data/ext/ice/cpp/src/Ice/Connector.cpp +6 -1
  238. data/ext/ice/cpp/src/Ice/Connector.h +4 -3
  239. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
  240. data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -4
  241. data/ext/ice/cpp/src/Ice/Current.cpp +29 -6
  242. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +6 -5
  243. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
  244. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
  245. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +5 -25
  246. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +29 -19
  247. data/ext/ice/cpp/src/Ice/Endpoint.cpp +85 -6
  248. data/ext/ice/cpp/src/Ice/EndpointF.cpp +27 -5
  249. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -1
  250. data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -6
  251. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
  252. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +35 -19
  253. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -4
  254. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
  255. data/ext/ice/cpp/src/Ice/EndpointI.cpp +17 -1
  256. data/ext/ice/cpp/src/Ice/EndpointI.h +35 -9
  257. data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -5
  258. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +18 -6
  259. data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -4
  260. data/ext/ice/cpp/src/Ice/EventHandler.h +13 -8
  261. data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -2
  262. data/ext/ice/cpp/src/Ice/Exception.cpp +95 -86
  263. data/ext/ice/cpp/src/Ice/FacetMap.cpp +20 -6
  264. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -28
  265. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -4
  266. data/ext/ice/cpp/src/Ice/GCObject.cpp +28 -25
  267. data/ext/ice/cpp/src/Ice/HashUtil.h +2 -3
  268. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -2
  269. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
  270. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +92 -53
  271. data/ext/ice/cpp/src/Ice/IPEndpointI.h +19 -10
  272. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -2
  273. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +56 -0
  274. data/ext/ice/cpp/src/Ice/Identity.cpp +24 -10
  275. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +37 -6
  276. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +27 -5
  277. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +14 -14
  278. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -5
  279. data/ext/ice/cpp/src/Ice/Incoming.cpp +276 -245
  280. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -209
  281. data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -4
  282. data/ext/ice/cpp/src/Ice/Initialize.cpp +299 -172
  283. data/ext/ice/cpp/src/Ice/InputStream.cpp +2773 -0
  284. data/ext/ice/cpp/src/Ice/Instance.cpp +191 -231
  285. data/ext/ice/cpp/src/Ice/Instance.h +30 -18
  286. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +106 -7
  287. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +27 -5
  288. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +117 -99
  289. data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -31
  290. data/ext/ice/cpp/src/Ice/LocalException.cpp +1190 -416
  291. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -2
  292. data/ext/ice/cpp/src/Ice/Locator.cpp +1167 -1215
  293. data/ext/ice/cpp/src/Ice/LocatorF.cpp +29 -6
  294. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +129 -163
  295. data/ext/ice/cpp/src/Ice/LocatorInfo.h +29 -29
  296. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
  297. data/ext/ice/cpp/src/Ice/Logger.cpp +35 -5
  298. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +178 -73
  299. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -4
  300. data/ext/ice/cpp/src/Ice/LoggerF.cpp +27 -5
  301. data/ext/ice/cpp/src/Ice/LoggerI.cpp +14 -44
  302. data/ext/ice/cpp/src/Ice/LoggerI.h +7 -13
  303. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -12
  304. data/ext/ice/cpp/src/Ice/Metrics.cpp +1059 -1069
  305. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +49 -19
  306. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -2
  307. data/ext/ice/cpp/src/Ice/Network.cpp +534 -170
  308. data/ext/ice/cpp/src/Ice/Network.h +100 -23
  309. data/ext/ice/cpp/src/Ice/NetworkF.h +2 -2
  310. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +21 -14
  311. data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -2
  312. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
  313. data/ext/ice/cpp/src/Ice/Object.cpp +217 -221
  314. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +41 -6
  315. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +27 -5
  316. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +35 -14
  317. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -7
  318. data/ext/ice/cpp/{include → src}/Ice/ObjectAdapterFactoryF.h +5 -1
  319. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +184 -58
  320. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +32 -26
  321. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +37 -6
  322. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -32
  323. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +40 -18
  324. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +14 -5
  325. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +803 -365
  326. data/ext/ice/cpp/src/Ice/OutputStream.cpp +1399 -0
  327. data/ext/ice/cpp/src/Ice/Plugin.cpp +45 -6
  328. data/ext/ice/cpp/src/Ice/PluginF.cpp +27 -5
  329. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +13 -13
  330. data/ext/ice/cpp/src/Ice/PluginManagerI.h +5 -6
  331. data/ext/ice/cpp/src/Ice/Process.cpp +256 -114
  332. data/ext/ice/cpp/src/Ice/ProcessF.cpp +29 -6
  333. data/ext/ice/cpp/src/Ice/Properties.cpp +38 -8
  334. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +340 -328
  335. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +81 -17
  336. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -5
  337. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +29 -6
  338. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -26
  339. data/ext/ice/cpp/src/Ice/PropertiesI.h +8 -11
  340. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +107 -50
  341. data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -2
  342. data/ext/ice/cpp/src/Ice/Protocol.cpp +2 -2
  343. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -2
  344. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -20
  345. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
  346. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -1
  347. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -1
  348. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
  349. data/ext/ice/cpp/src/Ice/Proxy.cpp +690 -964
  350. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +23 -32
  351. data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -11
  352. data/ext/ice/cpp/src/Ice/Reference.cpp +75 -69
  353. data/ext/ice/cpp/src/Ice/Reference.h +27 -22
  354. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +18 -21
  355. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -12
  356. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
  357. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +18 -4
  358. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
  359. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +672 -552
  360. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
  361. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -3
  362. data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -13
  363. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -6
  364. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -2
  365. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -6
  366. data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -7
  367. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +6 -12
  368. data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -6
  369. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
  370. data/ext/ice/cpp/src/Ice/Router.cpp +523 -474
  371. data/ext/ice/cpp/src/Ice/RouterF.cpp +29 -6
  372. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +91 -70
  373. data/ext/ice/cpp/src/Ice/RouterInfo.h +43 -32
  374. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
  375. data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +21 -21
  376. data/ext/ice/cpp/src/Ice/Selector.cpp +989 -923
  377. data/ext/ice/cpp/src/Ice/Selector.h +100 -147
  378. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +37 -6
  379. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +27 -5
  380. data/ext/ice/cpp/src/Ice/ServantManager.cpp +9 -9
  381. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
  382. data/ext/ice/cpp/src/Ice/SharedContext.h +2 -2
  383. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +20 -6
  384. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -2
  385. data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -20
  386. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +173 -18
  387. data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -4
  388. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +48 -17
  389. data/ext/ice/cpp/src/Ice/StringUtil.h +35 -0
  390. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +8 -4
  391. data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -3
  392. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +158 -32
  393. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -5
  394. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -7
  395. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -2
  396. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +40 -32
  397. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +11 -8
  398. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +12 -27
  399. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -10
  400. data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +24 -41
  401. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +175 -267
  402. data/ext/ice/cpp/src/Ice/ThreadPool.h +38 -43
  403. data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +28 -21
  404. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -2
  405. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
  406. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -2
  407. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -31
  408. data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -6
  409. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -2
  410. data/ext/ice/cpp/src/Ice/Transceiver.h +8 -7
  411. data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
  412. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +2 -8
  413. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -2
  414. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +92 -31
  415. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +12 -4
  416. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +150 -179
  417. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -17
  418. data/ext/ice/cpp/src/Ice/Value.cpp +81 -0
  419. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +84 -0
  420. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +70 -0
  421. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +42 -0
  422. data/ext/ice/cpp/src/Ice/Version.cpp +24 -14
  423. data/ext/ice/cpp/src/Ice/VirtualShared.h +43 -0
  424. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -9
  425. data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -7
  426. data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -11
  427. data/ext/ice/cpp/src/Ice/WSConnector.h +3 -6
  428. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +185 -80
  429. data/ext/ice/cpp/src/Ice/WSEndpoint.h +21 -31
  430. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +41 -37
  431. data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -21
  432. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +526 -264
  433. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +341 -455
  434. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +86 -26
  435. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -23
  436. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -61
  437. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -36
  438. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -59
  439. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -3
  440. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +396 -159
  441. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +251 -355
  442. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +52 -0
  443. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +526 -131
  444. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +19 -165
  445. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -17
  446. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +284 -0
  447. data/ext/ice/cpp/src/IceSSL/CertificateI.h +69 -0
  448. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +39 -11
  449. data/ext/ice/cpp/src/{Ice/ObjectFactoryF.cpp → IceSSL/ConnectionInfoF.cpp} +31 -9
  450. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +14 -56
  451. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -13
  452. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +205 -197
  453. data/ext/ice/cpp/src/IceSSL/EndpointI.h +41 -33
  454. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +39 -10
  455. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
  456. data/ext/ice/cpp/src/IceSSL/Instance.h +7 -7
  457. data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -7
  458. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +588 -0
  459. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +117 -152
  460. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +64 -0
  461. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +32 -0
  462. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +132 -0
  463. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +400 -89
  464. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +36 -21
  465. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +291 -0
  466. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +63 -0
  467. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -41
  468. data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -18
  469. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -54
  470. data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -7
  471. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +585 -0
  472. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +491 -75
  473. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +126 -0
  474. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +32 -0
  475. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +78 -0
  476. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +126 -169
  477. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +19 -22
  478. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +79 -74
  479. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +24 -187
  480. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -19
  481. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +862 -0
  482. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +56 -214
  483. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +60 -0
  484. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +31 -0
  485. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +80 -0
  486. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +137 -144
  487. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +25 -28
  488. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +857 -0
  489. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +46 -0
  490. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +9 -13
  491. data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -4
  492. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -3
  493. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +271 -0
  494. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +343 -0
  495. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +46 -0
  496. data/ext/ice/cpp/{include/Ice/ObjectFactoryManagerF.h → src/IceSSL/UWPEngineF.h} +13 -8
  497. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +94 -0
  498. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +388 -0
  499. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +76 -0
  500. data/ext/ice/cpp/src/IceSSL/Util.cpp +66 -1256
  501. data/ext/ice/cpp/src/IceSSL/Util.h +48 -137
  502. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +162 -0
  503. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -22
  504. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -26
  505. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +20 -31
  506. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +25 -116
  507. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
  508. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
  509. data/ext/ice/cpp/src/IceUtil/Options.cpp +23 -46
  510. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +7 -6
  511. data/ext/ice/cpp/src/IceUtil/Random.cpp +13 -13
  512. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +3 -9
  513. data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -3
  514. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -264
  515. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +540 -235
  516. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -74
  517. data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
  518. data/ext/ice/cpp/src/IceUtil/UUID.cpp +10 -10
  519. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +98 -97
  520. data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -35
  521. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +838 -0
  522. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +815 -163
  523. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +76 -0
  524. data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -2
  525. data/ext/ice/cpp/{include → src}/Slice/Checksum.h +2 -2
  526. data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -78
  527. data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -9
  528. data/ext/ice/cpp/src/Slice/Grammar.cpp +1994 -1943
  529. data/ext/ice/cpp/src/Slice/Grammar.h +44 -24
  530. data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -14
  531. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2658 -1927
  532. data/ext/ice/cpp/{include → src}/Slice/JavaUtil.h +178 -59
  533. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
  534. data/ext/ice/cpp/src/Slice/MD5.h +1 -1
  535. data/ext/ice/cpp/src/Slice/MD5I.cpp +0 -1
  536. data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
  537. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +12 -15
  538. data/ext/ice/cpp/{include → src}/Slice/PHPUtil.h +6 -15
  539. data/ext/ice/cpp/src/Slice/Parser.cpp +802 -307
  540. data/ext/ice/cpp/{include → src}/Slice/Parser.h +76 -84
  541. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +43 -21
  542. data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +7 -12
  543. data/ext/ice/cpp/src/Slice/Python.cpp +207 -86
  544. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +683 -679
  545. data/ext/ice/cpp/{include → src}/Slice/PythonUtil.h +19 -8
  546. data/ext/ice/cpp/src/Slice/Ruby.cpp +38 -34
  547. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +177 -445
  548. data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -6
  549. data/ext/ice/cpp/src/Slice/Scanner.cpp +218 -306
  550. data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +37 -64
  551. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +374 -0
  552. data/ext/ice/cpp/src/Slice/Util.h +54 -0
  553. data/ext/ice/mcpp/Makefile +5 -2
  554. data/ice.gemspec +2 -7
  555. data/lib/Glacier2.rb +1 -1
  556. data/lib/Glacier2/Metrics.rb +7 -46
  557. data/lib/Glacier2/PermissionsVerifier.rb +24 -95
  558. data/lib/Glacier2/PermissionsVerifierF.rb +3 -3
  559. data/lib/Glacier2/Router.rb +32 -74
  560. data/lib/Glacier2/RouterF.rb +3 -3
  561. data/lib/Glacier2/SSLInfo.rb +4 -7
  562. data/lib/Glacier2/Session.rb +88 -307
  563. data/lib/Ice.rb +83 -52
  564. data/lib/Ice/BuiltinSequences.rb +4 -4
  565. data/lib/Ice/Communicator.rb +56 -58
  566. data/lib/Ice/CommunicatorF.rb +3 -3
  567. data/lib/Ice/Connection.rb +153 -162
  568. data/lib/Ice/ConnectionF.rb +3 -3
  569. data/lib/Ice/Current.rb +4 -11
  570. data/lib/Ice/Endpoint.rb +57 -133
  571. data/lib/Ice/EndpointF.rb +3 -3
  572. data/lib/Ice/EndpointTypes.rb +3 -7
  573. data/lib/Ice/FacetMap.rb +4 -4
  574. data/lib/Ice/Identity.rb +5 -8
  575. data/lib/Ice/ImplicitContext.rb +5 -34
  576. data/lib/Ice/ImplicitContextF.rb +3 -3
  577. data/lib/Ice/Instrumentation.rb +23 -275
  578. data/lib/Ice/InstrumentationF.rb +3 -3
  579. data/lib/Ice/LocalException.rb +95 -141
  580. data/lib/Ice/Locator.rb +51 -165
  581. data/lib/Ice/LocatorF.rb +3 -3
  582. data/lib/Ice/Logger.rb +5 -34
  583. data/lib/Ice/LoggerF.rb +3 -3
  584. data/lib/Ice/Metrics.rb +61 -416
  585. data/lib/Ice/ObjectAdapter.rb +34 -0
  586. data/lib/Ice/ObjectAdapterF.rb +3 -3
  587. data/lib/Ice/ObjectFactory.rb +5 -30
  588. data/lib/Ice/Plugin.rb +7 -60
  589. data/lib/Ice/PluginF.rb +3 -3
  590. data/lib/Ice/Process.rb +16 -52
  591. data/lib/Ice/ProcessF.rb +3 -3
  592. data/lib/Ice/Properties.rb +5 -41
  593. data/lib/Ice/PropertiesAdmin.rb +19 -56
  594. data/lib/Ice/PropertiesF.rb +3 -3
  595. data/lib/Ice/RemoteLogger.rb +34 -115
  596. data/lib/Ice/Router.rb +29 -101
  597. data/lib/Ice/RouterF.rb +3 -3
  598. data/lib/Ice/ServantLocator.rb +31 -0
  599. data/lib/Ice/{ObjectFactoryF.rb → ServantLocatorF.rb} +6 -6
  600. data/lib/Ice/SliceChecksumDict.rb +3 -3
  601. data/lib/Ice/ValueFactory.rb +33 -0
  602. data/lib/Ice/Version.rb +5 -11
  603. data/lib/IceBox.rb +1 -1
  604. data/lib/IceBox/IceBox.rb +44 -148
  605. data/lib/IceGrid.rb +1 -4
  606. data/lib/IceGrid/Admin.rb +551 -427
  607. data/lib/IceGrid/Descriptor.rb +62 -529
  608. data/lib/IceGrid/Exception.rb +24 -45
  609. data/lib/IceGrid/FileParser.rb +14 -50
  610. data/lib/IceGrid/PluginFacade.rb +40 -0
  611. data/lib/IceGrid/Registry.rb +151 -58
  612. data/lib/IceGrid/Session.rb +25 -64
  613. data/lib/IceGrid/UserAccountMapper.rb +14 -50
  614. data/lib/IcePatch2.rb +1 -1
  615. data/lib/IcePatch2/FileInfo.rb +5 -11
  616. data/lib/IcePatch2/FileServer.rb +33 -76
  617. data/lib/IceStorm.rb +1 -1
  618. data/lib/IceStorm/IceStorm.rb +79 -206
  619. data/lib/IceStorm/Metrics.rb +11 -89
  620. data/slice/Glacier2/Metrics.ice +8 -4
  621. data/slice/Glacier2/PermissionsVerifier.ice +10 -7
  622. data/slice/Glacier2/PermissionsVerifierF.ice +7 -4
  623. data/slice/Glacier2/Router.ice +10 -8
  624. data/slice/Glacier2/RouterF.ice +7 -4
  625. data/slice/Glacier2/SSLInfo.ice +8 -5
  626. data/slice/Glacier2/Session.ice +15 -13
  627. data/slice/Ice/BuiltinSequences.ice +7 -4
  628. data/slice/Ice/Communicator.ice +141 -66
  629. data/slice/Ice/CommunicatorF.ice +7 -4
  630. data/slice/Ice/Connection.ice +183 -86
  631. data/slice/Ice/ConnectionF.ice +7 -4
  632. data/slice/Ice/Current.ice +13 -9
  633. data/slice/Ice/Endpoint.ice +63 -14
  634. data/slice/Ice/EndpointF.ice +7 -4
  635. data/slice/Ice/EndpointTypes.ice +8 -6
  636. data/slice/Ice/FacetMap.ice +7 -4
  637. data/slice/Ice/Identity.ice +13 -5
  638. data/slice/Ice/ImplicitContext.ice +20 -18
  639. data/slice/Ice/ImplicitContextF.ice +7 -4
  640. data/slice/Ice/Instrumentation.ice +20 -19
  641. data/slice/Ice/InstrumentationF.ice +8 -5
  642. data/slice/Ice/LocalException.ice +87 -87
  643. data/slice/Ice/Locator.ice +19 -18
  644. data/slice/Ice/LocatorF.ice +7 -4
  645. data/slice/Ice/Logger.ice +9 -7
  646. data/slice/Ice/LoggerF.ice +7 -4
  647. data/slice/Ice/Metrics.ice +18 -14
  648. data/slice/Ice/ObjectAdapter.ice +30 -13
  649. data/slice/Ice/ObjectAdapterF.ice +7 -4
  650. data/slice/Ice/ObjectFactory.ice +15 -12
  651. data/slice/Ice/Plugin.ice +9 -6
  652. data/slice/Ice/PluginF.ice +8 -5
  653. data/slice/Ice/Process.ice +9 -6
  654. data/slice/Ice/ProcessF.ice +7 -4
  655. data/slice/Ice/Properties.ice +15 -12
  656. data/slice/Ice/PropertiesAdmin.ice +9 -5
  657. data/slice/Ice/PropertiesF.ice +7 -4
  658. data/slice/Ice/RemoteLogger.ice +33 -24
  659. data/slice/Ice/Router.ice +16 -7
  660. data/slice/Ice/RouterF.ice +7 -4
  661. data/slice/Ice/ServantLocator.ice +13 -10
  662. data/slice/Ice/ServantLocatorF.ice +7 -4
  663. data/slice/Ice/SliceChecksumDict.ice +7 -4
  664. data/slice/Ice/ValueFactory.ice +127 -0
  665. data/slice/Ice/Version.ice +9 -5
  666. data/slice/IceBT/ConnectionInfo.ice +53 -0
  667. data/slice/IceBT/EndpointInfo.ice +51 -0
  668. data/slice/IceBT/Types.ice +39 -0
  669. data/slice/IceBox/IceBox.ice +20 -21
  670. data/slice/IceDiscovery/IceDiscovery.ice +9 -5
  671. data/slice/IceGrid/Admin.ice +390 -30
  672. data/slice/IceGrid/Descriptor.ice +37 -29
  673. data/slice/IceGrid/Exception.ice +33 -27
  674. data/slice/IceGrid/FileParser.ice +9 -6
  675. data/slice/IceGrid/PluginFacade.ice +11 -9
  676. data/slice/IceGrid/Registry.ice +139 -16
  677. data/slice/IceGrid/Session.ice +10 -8
  678. data/slice/IceGrid/UserAccountMapper.ice +9 -6
  679. data/slice/IceIAP/ConnectionInfo.ice +70 -0
  680. data/slice/IceIAP/EndpointInfo.ice +64 -0
  681. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +9 -7
  682. data/slice/IcePatch2/FileInfo.ice +9 -8
  683. data/slice/IcePatch2/FileServer.ice +17 -13
  684. data/slice/IceSSL/ConnectionInfo.ice +14 -17
  685. data/slice/IceSSL/ConnectionInfoF.ice +24 -0
  686. data/slice/IceSSL/EndpointInfo.ice +9 -30
  687. data/slice/IceStorm/IceStorm.ice +22 -18
  688. data/slice/IceStorm/Metrics.ice +9 -5
  689. metadata +154 -120
  690. data/ext/ObjectFactory.cpp +0 -140
  691. data/ext/ObjectFactory.h +0 -50
  692. data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
  693. data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
  694. data/ext/ice/cpp/include/Ice/Connection.h +0 -497
  695. data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
  696. data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
  697. data/ext/ice/cpp/include/Ice/Identity.h +0 -168
  698. data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
  699. data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
  700. data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
  701. data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
  702. data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
  703. data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
  704. data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
  705. data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
  706. data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
  707. data/ext/ice/cpp/include/Ice/Process.h +0 -574
  708. data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
  709. data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
  710. data/ext/ice/cpp/include/Ice/Router.h +0 -1159
  711. data/ext/ice/cpp/include/Ice/Stream.h +0 -447
  712. data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
  713. data/ext/ice/cpp/include/Ice/Version.h +0 -262
  714. data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
  715. data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
  716. data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
  717. data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
  718. data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
  719. data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
  720. data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
  721. data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
  722. data/ext/ice/cpp/include/Slice/Util.h +0 -56
  723. data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
  724. data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
  725. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
  726. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
  727. data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
  728. data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
  729. data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
  730. data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
  731. data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
  732. data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
  733. data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
  734. data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
  735. data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
  736. data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
  737. data/lib/IceGrid/Locator.rb +0 -106
  738. data/lib/IceGrid/Observer.rb +0 -572
  739. data/lib/IceGrid/Query.rb +0 -169
  740. data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
  741. data/slice/Freeze/CatalogData.ice +0 -49
  742. data/slice/Freeze/Connection.ice +0 -121
  743. data/slice/Freeze/DB.ice +0 -37
  744. data/slice/Freeze/Evictor.ice +0 -346
  745. data/slice/Freeze/EvictorF.ice +0 -22
  746. data/slice/Freeze/EvictorStorage.ice +0 -72
  747. data/slice/Freeze/Exception.ice +0 -100
  748. data/slice/Freeze/Transaction.ice +0 -58
  749. data/slice/Freeze/TransactionalEvictor.ice +0 -50
  750. data/slice/IceGrid/Locator.ice +0 -57
  751. data/slice/IceGrid/Observer.ice +0 -395
  752. data/slice/IceGrid/Query.ice +0 -131
@@ -1,13 +1,13 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.5
10
+ // Ice version 3.7.0
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -24,36 +24,63 @@
24
24
  #include <IceUtil/PushDisableWarnings.h>
25
25
  #include <Ice/ProxyF.h>
26
26
  #include <Ice/ObjectF.h>
27
+ #include <Ice/ValueF.h>
27
28
  #include <Ice/Exception.h>
28
29
  #include <Ice/LocalObject.h>
29
30
  #include <Ice/StreamHelpers.h>
31
+ #include <Ice/Comparable.h>
30
32
  #include <Ice/Proxy.h>
31
33
  #include <IceUtil/ScopedArray.h>
32
- #include <IceUtil/Optional.h>
34
+ #include <Ice/Optional.h>
33
35
  #include <IceUtil/UndefSysMacros.h>
34
36
 
35
37
  #ifndef ICE_IGNORE_VERSION
36
- # if ICE_INT_VERSION / 100 != 306
38
+ # if ICE_INT_VERSION / 100 != 307
37
39
  # error Ice version mismatch!
38
40
  # endif
39
41
  # if ICE_INT_VERSION % 100 > 50
40
42
  # error Beta header file detected
41
43
  # endif
42
- # if ICE_INT_VERSION % 100 < 5
44
+ # if ICE_INT_VERSION % 100 < 0
43
45
  # error Ice patch level mismatch!
44
46
  # endif
45
47
  #endif
46
48
 
47
49
  #ifndef ICE_API
48
- # ifdef ICE_API_EXPORTS
49
- # define ICE_API ICE_DECLSPEC_EXPORT
50
- # elif defined(ICE_STATIC_LIBS)
50
+ # if defined(ICE_STATIC_LIBS)
51
51
  # define ICE_API /**/
52
+ # elif defined(ICE_API_EXPORTS)
53
+ # define ICE_API ICE_DECLSPEC_EXPORT
52
54
  # else
53
55
  # define ICE_API ICE_DECLSPEC_IMPORT
54
56
  # endif
55
57
  #endif
56
58
 
59
+ #ifdef ICE_CPP11_MAPPING // C++11 mapping
60
+
61
+ namespace Ice
62
+ {
63
+
64
+ class Process;
65
+ class ProcessPrx;
66
+
67
+ }
68
+
69
+ namespace Ice
70
+ {
71
+
72
+ }
73
+
74
+ namespace Ice
75
+ {
76
+
77
+ using ProcessPtr = ::std::shared_ptr<Process>;
78
+ using ProcessPrxPtr = ::std::shared_ptr<ProcessPrx>;
79
+
80
+ }
81
+
82
+ #else // C++98 mapping
83
+
57
84
  namespace IceProxy
58
85
  {
59
86
 
@@ -61,7 +88,7 @@ namespace Ice
61
88
  {
62
89
 
63
90
  class Process;
64
- ICE_API void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>&);
91
+ ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>&);
65
92
  ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Process*);
66
93
 
67
94
  }
@@ -75,9 +102,17 @@ class Process;
75
102
  ICE_API ::Ice::Object* upCast(::Ice::Process*);
76
103
  typedef ::IceInternal::Handle< ::Ice::Process> ProcessPtr;
77
104
  typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process> ProcessPrx;
78
- ICE_API void __patch(ProcessPtr&, const ::Ice::ObjectPtr&);
105
+ typedef ProcessPrx ProcessPrxPtr;
106
+ ICE_API void _icePatchObjectPtr(ProcessPtr&, const ::Ice::ObjectPtr&);
79
107
 
80
108
  }
81
109
 
110
+ namespace Ice
111
+ {
112
+
113
+ }
114
+
115
+ #endif
116
+
82
117
  #include <IceUtil/PopDisableWarnings.h>
83
118
  #endif
@@ -1,13 +1,13 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.5
10
+ // Ice version 3.7.0
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -24,61 +24,105 @@
24
24
  #include <IceUtil/PushDisableWarnings.h>
25
25
  #include <Ice/ProxyF.h>
26
26
  #include <Ice/ObjectF.h>
27
+ #include <Ice/ValueF.h>
27
28
  #include <Ice/Exception.h>
28
29
  #include <Ice/LocalObject.h>
29
30
  #include <Ice/StreamHelpers.h>
31
+ #include <Ice/Comparable.h>
30
32
  #include <Ice/Proxy.h>
33
+ #include <Ice/Object.h>
31
34
  #include <Ice/GCObject.h>
32
- #include <Ice/AsyncResult.h>
35
+ #include <Ice/Value.h>
33
36
  #include <Ice/Incoming.h>
34
- #include <Ice/IncomingAsync.h>
37
+ #include <Ice/FactoryTableInit.h>
35
38
  #include <IceUtil/ScopedArray.h>
36
- #include <IceUtil/Optional.h>
37
- #include <Ice/StreamF.h>
39
+ #include <Ice/Optional.h>
38
40
  #include <Ice/PropertiesAdmin.h>
39
41
  #include <IceUtil/UndefSysMacros.h>
40
42
 
41
43
  #ifndef ICE_IGNORE_VERSION
42
- # if ICE_INT_VERSION / 100 != 306
44
+ # if ICE_INT_VERSION / 100 != 307
43
45
  # error Ice version mismatch!
44
46
  # endif
45
47
  # if ICE_INT_VERSION % 100 > 50
46
48
  # error Beta header file detected
47
49
  # endif
48
- # if ICE_INT_VERSION % 100 < 5
50
+ # if ICE_INT_VERSION % 100 < 0
49
51
  # error Ice patch level mismatch!
50
52
  # endif
51
53
  #endif
52
54
 
53
55
  #ifndef ICE_API
54
- # ifdef ICE_API_EXPORTS
55
- # define ICE_API ICE_DECLSPEC_EXPORT
56
- # elif defined(ICE_STATIC_LIBS)
56
+ # if defined(ICE_STATIC_LIBS)
57
57
  # define ICE_API /**/
58
+ # elif defined(ICE_API_EXPORTS)
59
+ # define ICE_API ICE_DECLSPEC_EXPORT
58
60
  # else
59
61
  # define ICE_API ICE_DECLSPEC_IMPORT
60
62
  # endif
61
63
  #endif
62
64
 
63
- namespace IceProxy
65
+ #ifdef ICE_CPP11_MAPPING // C++11 mapping
66
+
67
+ namespace Ice
64
68
  {
65
69
 
70
+ class Properties;
71
+
66
72
  }
67
73
 
68
74
  namespace Ice
69
75
  {
70
76
 
71
- class Properties;
72
- ICE_API ::Ice::LocalObject* upCast(::Ice::Properties*);
73
- typedef ::IceInternal::Handle< ::Ice::Properties> PropertiesPtr;
77
+ class ICE_CLASS(ICE_API) Properties
78
+ {
79
+ public:
80
+
81
+ ICE_MEMBER(ICE_API) virtual ~Properties();
82
+
83
+ virtual ::std::string getProperty(const ::std::string&) = 0;
84
+
85
+ virtual ::std::string getPropertyWithDefault(const ::std::string&, const ::std::string&) = 0;
86
+
87
+ virtual int getPropertyAsInt(const ::std::string&) = 0;
88
+
89
+ virtual int getPropertyAsIntWithDefault(const ::std::string&, int) = 0;
90
+
91
+ virtual ::Ice::StringSeq getPropertyAsList(const ::std::string&) = 0;
92
+
93
+ virtual ::Ice::StringSeq getPropertyAsListWithDefault(const ::std::string&, const ::Ice::StringSeq&) = 0;
94
+
95
+ virtual ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string&) = 0;
96
+
97
+ virtual void setProperty(const ::std::string&, const ::std::string&) = 0;
98
+
99
+ virtual ::Ice::StringSeq getCommandLineOptions() = 0;
100
+
101
+ virtual ::Ice::StringSeq parseCommandLineOptions(const ::std::string&, const ::Ice::StringSeq&) = 0;
102
+
103
+ virtual ::Ice::StringSeq parseIceCommandLineOptions(const ::Ice::StringSeq&) = 0;
104
+
105
+ virtual void load(const ::std::string&) = 0;
106
+
107
+ virtual ::std::shared_ptr<::Ice::Properties> clone() = 0;
108
+ };
74
109
 
75
110
  }
76
111
 
77
- namespace IceAsync
112
+ namespace Ice
78
113
  {
79
114
 
80
115
  }
81
116
 
117
+ namespace Ice
118
+ {
119
+
120
+ using PropertiesPtr = ::std::shared_ptr<Properties>;
121
+
122
+ }
123
+
124
+ #else // C++98 mapping
125
+
82
126
  namespace IceProxy
83
127
  {
84
128
 
@@ -87,12 +131,28 @@ namespace IceProxy
87
131
  namespace Ice
88
132
  {
89
133
 
90
- class ICE_API Properties : virtual public ::Ice::LocalObject
134
+ class Properties;
135
+ ICE_API ::Ice::LocalObject* upCast(::Ice::Properties*);
136
+ typedef ::IceInternal::Handle< ::Ice::Properties> PropertiesPtr;
137
+
138
+ }
139
+
140
+ namespace IceProxy
141
+ {
142
+
143
+ }
144
+
145
+ namespace Ice
146
+ {
147
+
148
+ class ICE_API Properties : public virtual ::Ice::LocalObject
91
149
  {
92
150
  public:
93
151
 
94
152
  typedef PropertiesPtr PointerType;
95
153
 
154
+ virtual ~Properties();
155
+
96
156
  virtual ::std::string getProperty(const ::std::string&) = 0;
97
157
 
98
158
  virtual ::std::string getPropertyWithDefault(const ::std::string&, const ::std::string&) = 0;
@@ -120,17 +180,24 @@ public:
120
180
  virtual ::Ice::PropertiesPtr clone() = 0;
121
181
  };
122
182
 
123
- inline bool operator==(const Properties& l, const Properties& r)
183
+ inline bool operator==(const Properties& lhs, const Properties& rhs)
124
184
  {
125
- return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
185
+ return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
126
186
  }
127
187
 
128
- inline bool operator<(const Properties& l, const Properties& r)
188
+ inline bool operator<(const Properties& lhs, const Properties& rhs)
129
189
  {
130
- return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
190
+ return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
191
+ }
192
+
131
193
  }
132
194
 
195
+ namespace Ice
196
+ {
197
+
133
198
  }
134
199
 
200
+ #endif
201
+
135
202
  #include <IceUtil/PopDisableWarnings.h>
136
203
  #endif
@@ -0,0 +1,749 @@
1
+ // **********************************************************************
2
+ //
3
+ // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
4
+ //
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
+ //
10
+ // Ice version 3.7.0
11
+ //
12
+ // <auto-generated>
13
+ //
14
+ // Generated from file `PropertiesAdmin.ice'
15
+ //
16
+ // Warning: do not edit this file.
17
+ //
18
+ // </auto-generated>
19
+ //
20
+
21
+ #ifndef __Ice_PropertiesAdmin_h__
22
+ #define __Ice_PropertiesAdmin_h__
23
+
24
+ #include <IceUtil/PushDisableWarnings.h>
25
+ #include <Ice/ProxyF.h>
26
+ #include <Ice/ObjectF.h>
27
+ #include <Ice/ValueF.h>
28
+ #include <Ice/Exception.h>
29
+ #include <Ice/LocalObject.h>
30
+ #include <Ice/StreamHelpers.h>
31
+ #include <Ice/Comparable.h>
32
+ #include <Ice/Proxy.h>
33
+ #include <Ice/Object.h>
34
+ #include <Ice/GCObject.h>
35
+ #include <Ice/Value.h>
36
+ #include <Ice/Incoming.h>
37
+ #include <Ice/FactoryTableInit.h>
38
+ #include <IceUtil/ScopedArray.h>
39
+ #include <Ice/Optional.h>
40
+ #include <Ice/BuiltinSequences.h>
41
+ #include <IceUtil/UndefSysMacros.h>
42
+
43
+ #ifndef ICE_IGNORE_VERSION
44
+ # if ICE_INT_VERSION / 100 != 307
45
+ # error Ice version mismatch!
46
+ # endif
47
+ # if ICE_INT_VERSION % 100 > 50
48
+ # error Beta header file detected
49
+ # endif
50
+ # if ICE_INT_VERSION % 100 < 0
51
+ # error Ice patch level mismatch!
52
+ # endif
53
+ #endif
54
+
55
+ #ifndef ICE_API
56
+ # if defined(ICE_STATIC_LIBS)
57
+ # define ICE_API /**/
58
+ # elif defined(ICE_API_EXPORTS)
59
+ # define ICE_API ICE_DECLSPEC_EXPORT
60
+ # else
61
+ # define ICE_API ICE_DECLSPEC_IMPORT
62
+ # endif
63
+ #endif
64
+
65
+ #ifdef ICE_CPP11_MAPPING // C++11 mapping
66
+
67
+ namespace Ice
68
+ {
69
+
70
+ class PropertiesAdmin;
71
+ class PropertiesAdminPrx;
72
+
73
+ }
74
+
75
+ namespace Ice
76
+ {
77
+
78
+ using PropertyDict = ::std::map<::std::string, ::std::string>;
79
+
80
+ }
81
+
82
+ namespace Ice
83
+ {
84
+
85
+ class ICE_API PropertiesAdmin : public virtual ::Ice::Object
86
+ {
87
+ public:
88
+
89
+ using ProxyType = PropertiesAdminPrx;
90
+
91
+ virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
92
+ virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
93
+ virtual ::std::string ice_id(const ::Ice::Current&) const override;
94
+
95
+ static const ::std::string& ice_staticId();
96
+
97
+ virtual ::std::string getProperty(::std::string, const ::Ice::Current&) = 0;
98
+ bool _iceD_getProperty(::IceInternal::Incoming&, const ::Ice::Current&);
99
+
100
+ virtual ::Ice::PropertyDict getPropertiesForPrefix(::std::string, const ::Ice::Current&) = 0;
101
+ bool _iceD_getPropertiesForPrefix(::IceInternal::Incoming&, const ::Ice::Current&);
102
+
103
+ virtual void setProperties(::Ice::PropertyDict, const ::Ice::Current&) = 0;
104
+ bool _iceD_setProperties(::IceInternal::Incoming&, const ::Ice::Current&);
105
+
106
+ virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
107
+ };
108
+
109
+ }
110
+
111
+ namespace Ice
112
+ {
113
+
114
+ class ICE_CLASS(ICE_API) PropertiesAdminPrx : public virtual ::Ice::Proxy<PropertiesAdminPrx, ::Ice::ObjectPrx>
115
+ {
116
+ public:
117
+
118
+ ::std::string getProperty(const ::std::string& iceP_key, const ::Ice::Context& context = Ice::noExplicitContext)
119
+ {
120
+ return _makePromiseOutgoing<::std::string>(true, this, &Ice::PropertiesAdminPrx::_iceI_getProperty, iceP_key, context).get();
121
+ }
122
+
123
+ template<template<typename> class P = ::std::promise>
124
+ auto getPropertyAsync(const ::std::string& iceP_key, const ::Ice::Context& context = Ice::noExplicitContext)
125
+ -> decltype(::std::declval<P<::std::string>>().get_future())
126
+ {
127
+ return _makePromiseOutgoing<::std::string, P>(false, this, &Ice::PropertiesAdminPrx::_iceI_getProperty, iceP_key, context);
128
+ }
129
+
130
+ ::std::function<void()>
131
+ getPropertyAsync(const ::std::string& iceP_key,
132
+ ::std::function<void(::std::string)> response,
133
+ ::std::function<void(::std::exception_ptr)> ex = nullptr,
134
+ ::std::function<void(bool)> sent = nullptr,
135
+ const ::Ice::Context& context = Ice::noExplicitContext)
136
+ {
137
+ return _makeLamdaOutgoing<::std::string>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_getProperty, iceP_key, context);
138
+ }
139
+
140
+ ICE_MEMBER(ICE_API) void _iceI_getProperty(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>&, const ::std::string&, const ::Ice::Context&);
141
+
142
+ ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::Context& context = Ice::noExplicitContext)
143
+ {
144
+ return _makePromiseOutgoing<::Ice::PropertyDict>(true, this, &Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix, iceP_prefix, context).get();
145
+ }
146
+
147
+ template<template<typename> class P = ::std::promise>
148
+ auto getPropertiesForPrefixAsync(const ::std::string& iceP_prefix, const ::Ice::Context& context = Ice::noExplicitContext)
149
+ -> decltype(::std::declval<P<::Ice::PropertyDict>>().get_future())
150
+ {
151
+ return _makePromiseOutgoing<::Ice::PropertyDict, P>(false, this, &Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix, iceP_prefix, context);
152
+ }
153
+
154
+ ::std::function<void()>
155
+ getPropertiesForPrefixAsync(const ::std::string& iceP_prefix,
156
+ ::std::function<void(::Ice::PropertyDict)> response,
157
+ ::std::function<void(::std::exception_ptr)> ex = nullptr,
158
+ ::std::function<void(bool)> sent = nullptr,
159
+ const ::Ice::Context& context = Ice::noExplicitContext)
160
+ {
161
+ return _makeLamdaOutgoing<::Ice::PropertyDict>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix, iceP_prefix, context);
162
+ }
163
+
164
+ ICE_MEMBER(ICE_API) void _iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::PropertyDict>>&, const ::std::string&, const ::Ice::Context&);
165
+
166
+ void setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context = Ice::noExplicitContext)
167
+ {
168
+ _makePromiseOutgoing<void>(true, this, &Ice::PropertiesAdminPrx::_iceI_setProperties, iceP_newProperties, context).get();
169
+ }
170
+
171
+ template<template<typename> class P = ::std::promise>
172
+ auto setPropertiesAsync(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context = Ice::noExplicitContext)
173
+ -> decltype(::std::declval<P<void>>().get_future())
174
+ {
175
+ return _makePromiseOutgoing<void, P>(false, this, &Ice::PropertiesAdminPrx::_iceI_setProperties, iceP_newProperties, context);
176
+ }
177
+
178
+ ::std::function<void()>
179
+ setPropertiesAsync(const ::Ice::PropertyDict& iceP_newProperties,
180
+ ::std::function<void()> response,
181
+ ::std::function<void(::std::exception_ptr)> ex = nullptr,
182
+ ::std::function<void(bool)> sent = nullptr,
183
+ const ::Ice::Context& context = Ice::noExplicitContext)
184
+ {
185
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_setProperties, iceP_newProperties, context);
186
+ }
187
+
188
+ ICE_MEMBER(ICE_API) void _iceI_setProperties(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::Ice::PropertyDict&, const ::Ice::Context&);
189
+
190
+ ICE_MEMBER(ICE_API) static const ::std::string& ice_staticId();
191
+
192
+ protected:
193
+
194
+ PropertiesAdminPrx() = default;
195
+ friend ::std::shared_ptr<PropertiesAdminPrx> IceInternal::createProxy<PropertiesAdminPrx>();
196
+
197
+ ICE_MEMBER(ICE_API) virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
198
+ };
199
+
200
+ }
201
+
202
+ namespace Ice
203
+ {
204
+
205
+ }
206
+
207
+ namespace Ice
208
+ {
209
+
210
+ using PropertiesAdminPtr = ::std::shared_ptr<PropertiesAdmin>;
211
+ using PropertiesAdminPrxPtr = ::std::shared_ptr<PropertiesAdminPrx>;
212
+
213
+ }
214
+
215
+ #else // C++98 mapping
216
+
217
+ namespace IceProxy
218
+ {
219
+
220
+ namespace Ice
221
+ {
222
+
223
+ class PropertiesAdmin;
224
+ ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin>&);
225
+ ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::PropertiesAdmin*);
226
+
227
+ }
228
+
229
+ }
230
+
231
+ namespace Ice
232
+ {
233
+
234
+ class PropertiesAdmin;
235
+ ICE_API ::Ice::Object* upCast(::Ice::PropertiesAdmin*);
236
+ typedef ::IceInternal::Handle< ::Ice::PropertiesAdmin> PropertiesAdminPtr;
237
+ typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin> PropertiesAdminPrx;
238
+ typedef PropertiesAdminPrx PropertiesAdminPrxPtr;
239
+ ICE_API void _icePatchObjectPtr(PropertiesAdminPtr&, const ::Ice::ObjectPtr&);
240
+
241
+ }
242
+
243
+ namespace Ice
244
+ {
245
+
246
+ typedef ::std::map< ::std::string, ::std::string> PropertyDict;
247
+
248
+ }
249
+
250
+ namespace Ice
251
+ {
252
+
253
+ class Callback_PropertiesAdmin_getProperty_Base : public virtual ::IceInternal::CallbackBase { };
254
+ typedef ::IceUtil::Handle< Callback_PropertiesAdmin_getProperty_Base> Callback_PropertiesAdmin_getPropertyPtr;
255
+
256
+ class Callback_PropertiesAdmin_getPropertiesForPrefix_Base : public virtual ::IceInternal::CallbackBase { };
257
+ typedef ::IceUtil::Handle< Callback_PropertiesAdmin_getPropertiesForPrefix_Base> Callback_PropertiesAdmin_getPropertiesForPrefixPtr;
258
+
259
+ class Callback_PropertiesAdmin_setProperties_Base : public virtual ::IceInternal::CallbackBase { };
260
+ typedef ::IceUtil::Handle< Callback_PropertiesAdmin_setProperties_Base> Callback_PropertiesAdmin_setPropertiesPtr;
261
+
262
+ }
263
+
264
+ namespace IceProxy
265
+ {
266
+
267
+ namespace Ice
268
+ {
269
+
270
+ class ICE_CLASS(ICE_API) PropertiesAdmin : public virtual ::Ice::Proxy<PropertiesAdmin, ::IceProxy::Ice::Object>
271
+ {
272
+ public:
273
+
274
+ ICE_MEMBER(ICE_API) ::std::string getProperty(const ::std::string& iceP_key, const ::Ice::Context& context = ::Ice::noExplicitContext)
275
+ {
276
+ return end_getProperty(_iceI_begin_getProperty(iceP_key, context, ::IceInternal::dummyCallback, 0, true));
277
+ }
278
+
279
+ ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& iceP_key, const ::Ice::Context& context = ::Ice::noExplicitContext)
280
+ {
281
+ return _iceI_begin_getProperty(iceP_key, context, ::IceInternal::dummyCallback, 0);
282
+ }
283
+
284
+ ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& iceP_key, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
285
+ {
286
+ return _iceI_begin_getProperty(iceP_key, ::Ice::noExplicitContext, del, cookie);
287
+ }
288
+
289
+ ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& iceP_key, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
290
+ {
291
+ return _iceI_begin_getProperty(iceP_key, context, del, cookie);
292
+ }
293
+
294
+ ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& iceP_key, const ::Ice::Callback_PropertiesAdmin_getPropertyPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
295
+ {
296
+ return _iceI_begin_getProperty(iceP_key, ::Ice::noExplicitContext, del, cookie);
297
+ }
298
+
299
+ ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& iceP_key, const ::Ice::Context& context, const ::Ice::Callback_PropertiesAdmin_getPropertyPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
300
+ {
301
+ return _iceI_begin_getProperty(iceP_key, context, del, cookie);
302
+ }
303
+
304
+ ICE_MEMBER(ICE_API) ::std::string end_getProperty(const ::Ice::AsyncResultPtr&);
305
+
306
+ private:
307
+
308
+ ICE_MEMBER(ICE_API) ::Ice::AsyncResultPtr _iceI_begin_getProperty(const ::std::string&, const ::Ice::Context&, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& cookie = 0, bool sync = false);
309
+
310
+ public:
311
+
312
+ ICE_MEMBER(ICE_API) ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::Context& context = ::Ice::noExplicitContext)
313
+ {
314
+ return end_getPropertiesForPrefix(_iceI_begin_getPropertiesForPrefix(iceP_prefix, context, ::IceInternal::dummyCallback, 0, true));
315
+ }
316
+
317
+ ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::Context& context = ::Ice::noExplicitContext)
318
+ {
319
+ return _iceI_begin_getPropertiesForPrefix(iceP_prefix, context, ::IceInternal::dummyCallback, 0);
320
+ }
321
+
322
+ ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
323
+ {
324
+ return _iceI_begin_getPropertiesForPrefix(iceP_prefix, ::Ice::noExplicitContext, del, cookie);
325
+ }
326
+
327
+ ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
328
+ {
329
+ return _iceI_begin_getPropertiesForPrefix(iceP_prefix, context, del, cookie);
330
+ }
331
+
332
+ ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::Callback_PropertiesAdmin_getPropertiesForPrefixPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
333
+ {
334
+ return _iceI_begin_getPropertiesForPrefix(iceP_prefix, ::Ice::noExplicitContext, del, cookie);
335
+ }
336
+
337
+ ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::Context& context, const ::Ice::Callback_PropertiesAdmin_getPropertiesForPrefixPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
338
+ {
339
+ return _iceI_begin_getPropertiesForPrefix(iceP_prefix, context, del, cookie);
340
+ }
341
+
342
+ ICE_MEMBER(ICE_API) ::Ice::PropertyDict end_getPropertiesForPrefix(const ::Ice::AsyncResultPtr&);
343
+
344
+ private:
345
+
346
+ ICE_MEMBER(ICE_API) ::Ice::AsyncResultPtr _iceI_begin_getPropertiesForPrefix(const ::std::string&, const ::Ice::Context&, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& cookie = 0, bool sync = false);
347
+
348
+ public:
349
+
350
+ ICE_MEMBER(ICE_API) void setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context = ::Ice::noExplicitContext)
351
+ {
352
+ end_setProperties(_iceI_begin_setProperties(iceP_newProperties, context, ::IceInternal::dummyCallback, 0, true));
353
+ }
354
+
355
+ ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context = ::Ice::noExplicitContext)
356
+ {
357
+ return _iceI_begin_setProperties(iceP_newProperties, context, ::IceInternal::dummyCallback, 0);
358
+ }
359
+
360
+ ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
361
+ {
362
+ return _iceI_begin_setProperties(iceP_newProperties, ::Ice::noExplicitContext, del, cookie);
363
+ }
364
+
365
+ ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
366
+ {
367
+ return _iceI_begin_setProperties(iceP_newProperties, context, del, cookie);
368
+ }
369
+
370
+ ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Callback_PropertiesAdmin_setPropertiesPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
371
+ {
372
+ return _iceI_begin_setProperties(iceP_newProperties, ::Ice::noExplicitContext, del, cookie);
373
+ }
374
+
375
+ ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context, const ::Ice::Callback_PropertiesAdmin_setPropertiesPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
376
+ {
377
+ return _iceI_begin_setProperties(iceP_newProperties, context, del, cookie);
378
+ }
379
+
380
+ ICE_MEMBER(ICE_API) void end_setProperties(const ::Ice::AsyncResultPtr&);
381
+
382
+ private:
383
+
384
+ ICE_MEMBER(ICE_API) ::Ice::AsyncResultPtr _iceI_begin_setProperties(const ::Ice::PropertyDict&, const ::Ice::Context&, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& cookie = 0, bool sync = false);
385
+
386
+ public:
387
+
388
+ ICE_MEMBER(ICE_API) static const ::std::string& ice_staticId();
389
+
390
+ protected:
391
+
392
+ ICE_MEMBER(ICE_API) virtual ::IceProxy::Ice::Object* _newInstance() const;
393
+ };
394
+
395
+ }
396
+
397
+ }
398
+
399
+ namespace Ice
400
+ {
401
+
402
+ class ICE_API PropertiesAdmin : public virtual ::Ice::Object
403
+ {
404
+ public:
405
+
406
+ typedef PropertiesAdminPrx ProxyType;
407
+ typedef PropertiesAdminPtr PointerType;
408
+
409
+ virtual ~PropertiesAdmin();
410
+
411
+ virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
412
+ virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
413
+ virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
414
+
415
+ static const ::std::string& ice_staticId();
416
+
417
+ virtual ::std::string getProperty(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
418
+ bool _iceD_getProperty(::IceInternal::Incoming&, const ::Ice::Current&);
419
+
420
+ virtual ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
421
+ bool _iceD_getPropertiesForPrefix(::IceInternal::Incoming&, const ::Ice::Current&);
422
+
423
+ virtual void setProperties(const ::Ice::PropertyDict&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
424
+ bool _iceD_setProperties(::IceInternal::Incoming&, const ::Ice::Current&);
425
+
426
+ virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
427
+
428
+ protected:
429
+
430
+ virtual void _iceWriteImpl(::Ice::OutputStream*) const;
431
+ virtual void _iceReadImpl(::Ice::InputStream*);
432
+ };
433
+
434
+ inline bool operator==(const PropertiesAdmin& lhs, const PropertiesAdmin& rhs)
435
+ {
436
+ return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
437
+ }
438
+
439
+ inline bool operator<(const PropertiesAdmin& lhs, const PropertiesAdmin& rhs)
440
+ {
441
+ return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
442
+ }
443
+
444
+ }
445
+
446
+ namespace Ice
447
+ {
448
+
449
+ }
450
+
451
+ namespace Ice
452
+ {
453
+
454
+ template<class T>
455
+ class CallbackNC_PropertiesAdmin_getProperty : public Callback_PropertiesAdmin_getProperty_Base, public ::IceInternal::TwowayCallbackNC<T>
456
+ {
457
+ public:
458
+
459
+ typedef IceUtil::Handle<T> TPtr;
460
+
461
+ typedef void (T::*Exception)(const ::Ice::Exception&);
462
+ typedef void (T::*Sent)(bool);
463
+ typedef void (T::*Response)(const ::std::string&);
464
+
465
+ CallbackNC_PropertiesAdmin_getProperty(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
466
+ : ::IceInternal::TwowayCallbackNC<T>(obj, cb != 0, excb, sentcb), _response(cb)
467
+ {
468
+ }
469
+
470
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
471
+ {
472
+ ::Ice::PropertiesAdminPrx proxy = ::Ice::PropertiesAdminPrx::uncheckedCast(result->getProxy());
473
+ ::std::string ret;
474
+ try
475
+ {
476
+ ret = proxy->end_getProperty(result);
477
+ }
478
+ catch(const ::Ice::Exception& ex)
479
+ {
480
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
481
+ return;
482
+ }
483
+ if(_response)
484
+ {
485
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret);
486
+ }
487
+ }
488
+
489
+ private:
490
+
491
+ Response _response;
492
+ };
493
+
494
+ template<class T> Callback_PropertiesAdmin_getPropertyPtr
495
+ newCallback_PropertiesAdmin_getProperty(const IceUtil::Handle<T>& instance, void (T::*cb)(const ::std::string&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
496
+ {
497
+ return new CallbackNC_PropertiesAdmin_getProperty<T>(instance, cb, excb, sentcb);
498
+ }
499
+
500
+ template<class T> Callback_PropertiesAdmin_getPropertyPtr
501
+ newCallback_PropertiesAdmin_getProperty(T* instance, void (T::*cb)(const ::std::string&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
502
+ {
503
+ return new CallbackNC_PropertiesAdmin_getProperty<T>(instance, cb, excb, sentcb);
504
+ }
505
+
506
+ template<class T, typename CT>
507
+ class Callback_PropertiesAdmin_getProperty : public Callback_PropertiesAdmin_getProperty_Base, public ::IceInternal::TwowayCallback<T, CT>
508
+ {
509
+ public:
510
+
511
+ typedef IceUtil::Handle<T> TPtr;
512
+
513
+ typedef void (T::*Exception)(const ::Ice::Exception& , const CT&);
514
+ typedef void (T::*Sent)(bool , const CT&);
515
+ typedef void (T::*Response)(const ::std::string&, const CT&);
516
+
517
+ Callback_PropertiesAdmin_getProperty(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
518
+ : ::IceInternal::TwowayCallback<T, CT>(obj, cb != 0, excb, sentcb), _response(cb)
519
+ {
520
+ }
521
+
522
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
523
+ {
524
+ ::Ice::PropertiesAdminPrx proxy = ::Ice::PropertiesAdminPrx::uncheckedCast(result->getProxy());
525
+ ::std::string ret;
526
+ try
527
+ {
528
+ ret = proxy->end_getProperty(result);
529
+ }
530
+ catch(const ::Ice::Exception& ex)
531
+ {
532
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
533
+ return;
534
+ }
535
+ if(_response)
536
+ {
537
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret, CT::dynamicCast(result->getCookie()));
538
+ }
539
+ }
540
+
541
+ private:
542
+
543
+ Response _response;
544
+ };
545
+
546
+ template<class T, typename CT> Callback_PropertiesAdmin_getPropertyPtr
547
+ newCallback_PropertiesAdmin_getProperty(const IceUtil::Handle<T>& instance, void (T::*cb)(const ::std::string&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
548
+ {
549
+ return new Callback_PropertiesAdmin_getProperty<T, CT>(instance, cb, excb, sentcb);
550
+ }
551
+
552
+ template<class T, typename CT> Callback_PropertiesAdmin_getPropertyPtr
553
+ newCallback_PropertiesAdmin_getProperty(T* instance, void (T::*cb)(const ::std::string&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
554
+ {
555
+ return new Callback_PropertiesAdmin_getProperty<T, CT>(instance, cb, excb, sentcb);
556
+ }
557
+
558
+ template<class T>
559
+ class CallbackNC_PropertiesAdmin_getPropertiesForPrefix : public Callback_PropertiesAdmin_getPropertiesForPrefix_Base, public ::IceInternal::TwowayCallbackNC<T>
560
+ {
561
+ public:
562
+
563
+ typedef IceUtil::Handle<T> TPtr;
564
+
565
+ typedef void (T::*Exception)(const ::Ice::Exception&);
566
+ typedef void (T::*Sent)(bool);
567
+ typedef void (T::*Response)(const ::Ice::PropertyDict&);
568
+
569
+ CallbackNC_PropertiesAdmin_getPropertiesForPrefix(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
570
+ : ::IceInternal::TwowayCallbackNC<T>(obj, cb != 0, excb, sentcb), _response(cb)
571
+ {
572
+ }
573
+
574
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
575
+ {
576
+ ::Ice::PropertiesAdminPrx proxy = ::Ice::PropertiesAdminPrx::uncheckedCast(result->getProxy());
577
+ ::Ice::PropertyDict ret;
578
+ try
579
+ {
580
+ ret = proxy->end_getPropertiesForPrefix(result);
581
+ }
582
+ catch(const ::Ice::Exception& ex)
583
+ {
584
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
585
+ return;
586
+ }
587
+ if(_response)
588
+ {
589
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret);
590
+ }
591
+ }
592
+
593
+ private:
594
+
595
+ Response _response;
596
+ };
597
+
598
+ template<class T> Callback_PropertiesAdmin_getPropertiesForPrefixPtr
599
+ newCallback_PropertiesAdmin_getPropertiesForPrefix(const IceUtil::Handle<T>& instance, void (T::*cb)(const ::Ice::PropertyDict&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
600
+ {
601
+ return new CallbackNC_PropertiesAdmin_getPropertiesForPrefix<T>(instance, cb, excb, sentcb);
602
+ }
603
+
604
+ template<class T> Callback_PropertiesAdmin_getPropertiesForPrefixPtr
605
+ newCallback_PropertiesAdmin_getPropertiesForPrefix(T* instance, void (T::*cb)(const ::Ice::PropertyDict&), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
606
+ {
607
+ return new CallbackNC_PropertiesAdmin_getPropertiesForPrefix<T>(instance, cb, excb, sentcb);
608
+ }
609
+
610
+ template<class T, typename CT>
611
+ class Callback_PropertiesAdmin_getPropertiesForPrefix : public Callback_PropertiesAdmin_getPropertiesForPrefix_Base, public ::IceInternal::TwowayCallback<T, CT>
612
+ {
613
+ public:
614
+
615
+ typedef IceUtil::Handle<T> TPtr;
616
+
617
+ typedef void (T::*Exception)(const ::Ice::Exception& , const CT&);
618
+ typedef void (T::*Sent)(bool , const CT&);
619
+ typedef void (T::*Response)(const ::Ice::PropertyDict&, const CT&);
620
+
621
+ Callback_PropertiesAdmin_getPropertiesForPrefix(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
622
+ : ::IceInternal::TwowayCallback<T, CT>(obj, cb != 0, excb, sentcb), _response(cb)
623
+ {
624
+ }
625
+
626
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
627
+ {
628
+ ::Ice::PropertiesAdminPrx proxy = ::Ice::PropertiesAdminPrx::uncheckedCast(result->getProxy());
629
+ ::Ice::PropertyDict ret;
630
+ try
631
+ {
632
+ ret = proxy->end_getPropertiesForPrefix(result);
633
+ }
634
+ catch(const ::Ice::Exception& ex)
635
+ {
636
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
637
+ return;
638
+ }
639
+ if(_response)
640
+ {
641
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret, CT::dynamicCast(result->getCookie()));
642
+ }
643
+ }
644
+
645
+ private:
646
+
647
+ Response _response;
648
+ };
649
+
650
+ template<class T, typename CT> Callback_PropertiesAdmin_getPropertiesForPrefixPtr
651
+ newCallback_PropertiesAdmin_getPropertiesForPrefix(const IceUtil::Handle<T>& instance, void (T::*cb)(const ::Ice::PropertyDict&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
652
+ {
653
+ return new Callback_PropertiesAdmin_getPropertiesForPrefix<T, CT>(instance, cb, excb, sentcb);
654
+ }
655
+
656
+ template<class T, typename CT> Callback_PropertiesAdmin_getPropertiesForPrefixPtr
657
+ newCallback_PropertiesAdmin_getPropertiesForPrefix(T* instance, void (T::*cb)(const ::Ice::PropertyDict&, const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
658
+ {
659
+ return new Callback_PropertiesAdmin_getPropertiesForPrefix<T, CT>(instance, cb, excb, sentcb);
660
+ }
661
+
662
+ template<class T>
663
+ class CallbackNC_PropertiesAdmin_setProperties : public Callback_PropertiesAdmin_setProperties_Base, public ::IceInternal::OnewayCallbackNC<T>
664
+ {
665
+ public:
666
+
667
+ typedef IceUtil::Handle<T> TPtr;
668
+
669
+ typedef void (T::*Exception)(const ::Ice::Exception&);
670
+ typedef void (T::*Sent)(bool);
671
+ typedef void (T::*Response)();
672
+
673
+ CallbackNC_PropertiesAdmin_setProperties(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
674
+ : ::IceInternal::OnewayCallbackNC<T>(obj, cb, excb, sentcb)
675
+ {
676
+ }
677
+ };
678
+
679
+ template<class T> Callback_PropertiesAdmin_setPropertiesPtr
680
+ newCallback_PropertiesAdmin_setProperties(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
681
+ {
682
+ return new CallbackNC_PropertiesAdmin_setProperties<T>(instance, cb, excb, sentcb);
683
+ }
684
+
685
+ template<class T> Callback_PropertiesAdmin_setPropertiesPtr
686
+ newCallback_PropertiesAdmin_setProperties(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
687
+ {
688
+ return new CallbackNC_PropertiesAdmin_setProperties<T>(instance, 0, excb, sentcb);
689
+ }
690
+
691
+ template<class T> Callback_PropertiesAdmin_setPropertiesPtr
692
+ newCallback_PropertiesAdmin_setProperties(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
693
+ {
694
+ return new CallbackNC_PropertiesAdmin_setProperties<T>(instance, cb, excb, sentcb);
695
+ }
696
+
697
+ template<class T> Callback_PropertiesAdmin_setPropertiesPtr
698
+ newCallback_PropertiesAdmin_setProperties(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
699
+ {
700
+ return new CallbackNC_PropertiesAdmin_setProperties<T>(instance, 0, excb, sentcb);
701
+ }
702
+
703
+ template<class T, typename CT>
704
+ class Callback_PropertiesAdmin_setProperties : public Callback_PropertiesAdmin_setProperties_Base, public ::IceInternal::OnewayCallback<T, CT>
705
+ {
706
+ public:
707
+
708
+ typedef IceUtil::Handle<T> TPtr;
709
+
710
+ typedef void (T::*Exception)(const ::Ice::Exception& , const CT&);
711
+ typedef void (T::*Sent)(bool , const CT&);
712
+ typedef void (T::*Response)(const CT&);
713
+
714
+ Callback_PropertiesAdmin_setProperties(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
715
+ : ::IceInternal::OnewayCallback<T, CT>(obj, cb, excb, sentcb)
716
+ {
717
+ }
718
+ };
719
+
720
+ template<class T, typename CT> Callback_PropertiesAdmin_setPropertiesPtr
721
+ newCallback_PropertiesAdmin_setProperties(const IceUtil::Handle<T>& instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
722
+ {
723
+ return new Callback_PropertiesAdmin_setProperties<T, CT>(instance, cb, excb, sentcb);
724
+ }
725
+
726
+ template<class T, typename CT> Callback_PropertiesAdmin_setPropertiesPtr
727
+ newCallback_PropertiesAdmin_setProperties(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
728
+ {
729
+ return new Callback_PropertiesAdmin_setProperties<T, CT>(instance, 0, excb, sentcb);
730
+ }
731
+
732
+ template<class T, typename CT> Callback_PropertiesAdmin_setPropertiesPtr
733
+ newCallback_PropertiesAdmin_setProperties(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
734
+ {
735
+ return new Callback_PropertiesAdmin_setProperties<T, CT>(instance, cb, excb, sentcb);
736
+ }
737
+
738
+ template<class T, typename CT> Callback_PropertiesAdmin_setPropertiesPtr
739
+ newCallback_PropertiesAdmin_setProperties(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
740
+ {
741
+ return new Callback_PropertiesAdmin_setProperties<T, CT>(instance, 0, excb, sentcb);
742
+ }
743
+
744
+ }
745
+
746
+ #endif
747
+
748
+ #include <IceUtil/PopDisableWarnings.h>
749
+ #endif