zeroc-ice 3.6b1 → 3.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (679) hide show
  1. checksums.yaml +4 -4
  2. data/{ext/ice/BZIP_LICENSE → BZIP2_LICENSE} +0 -0
  3. data/ICE_LICENSE +8 -14
  4. data/LICENSE +2 -1
  5. data/{ext/ice/MCPP_LICENSE → MCPP_LICENSE} +2 -9
  6. data/bin/slice2rb +1 -1
  7. data/ext/Communicator.cpp +1 -1
  8. data/ext/Communicator.h +1 -1
  9. data/ext/Config.h +1 -22
  10. data/ext/Connection.cpp +125 -13
  11. data/ext/Connection.h +1 -1
  12. data/ext/Endpoint.cpp +62 -3
  13. data/ext/Endpoint.h +1 -1
  14. data/ext/ImplicitContext.cpp +1 -1
  15. data/ext/ImplicitContext.h +1 -1
  16. data/ext/Init.cpp +8 -1
  17. data/ext/Logger.cpp +1 -1
  18. data/ext/Logger.h +1 -1
  19. data/ext/ObjectFactory.cpp +1 -1
  20. data/ext/ObjectFactory.h +1 -1
  21. data/ext/Operation.cpp +1 -1
  22. data/ext/Operation.h +1 -1
  23. data/ext/Properties.cpp +1 -1
  24. data/ext/Properties.h +1 -1
  25. data/ext/Proxy.cpp +1 -1
  26. data/ext/Proxy.h +1 -1
  27. data/ext/Slice.cpp +1 -1
  28. data/ext/Slice.h +1 -1
  29. data/ext/Types.cpp +65 -17
  30. data/ext/Types.h +4 -1
  31. data/ext/Util.cpp +49 -58
  32. data/ext/Util.h +1 -1
  33. data/ext/extconf.rb +17 -15
  34. data/ext/ice/cpp/include/Ice/ACMF.h +1 -1
  35. data/ext/ice/cpp/include/Ice/Application.h +1 -1
  36. data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -1
  37. data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
  38. data/ext/ice/cpp/include/Ice/BasicStream.h +1 -1
  39. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +52 -0
  40. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +25 -0
  41. data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
  42. data/ext/ice/cpp/include/Ice/BuiltinSequences.h +12 -4
  43. data/ext/ice/cpp/include/Ice/Communicator.h +12 -4
  44. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -1
  45. data/ext/ice/cpp/include/Ice/CommunicatorF.h +12 -4
  46. data/ext/ice/cpp/include/Ice/Config.h +13 -8
  47. data/ext/ice/cpp/include/Ice/Connection.h +41 -16
  48. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -1
  49. data/ext/ice/cpp/include/Ice/ConnectionF.h +12 -4
  50. data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +1 -1
  51. data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -1
  52. data/ext/ice/cpp/include/Ice/Current.h +12 -4
  53. data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +1 -1
  54. data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +1 -1
  55. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -1
  56. data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -1
  57. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -1
  58. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
  59. data/ext/ice/cpp/include/Ice/Endpoint.h +16 -6
  60. data/ext/ice/cpp/include/Ice/EndpointF.h +12 -4
  61. data/ext/ice/cpp/include/Ice/EndpointTypes.h +12 -4
  62. data/ext/ice/cpp/include/Ice/Exception.h +3 -3
  63. data/ext/ice/cpp/include/Ice/FacetMap.h +12 -4
  64. data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -1
  65. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
  66. data/ext/ice/cpp/include/Ice/Format.h +1 -1
  67. data/ext/ice/cpp/include/Ice/Functional.h +1 -1
  68. data/ext/ice/cpp/include/Ice/GCObject.h +5 -1
  69. data/ext/ice/cpp/include/Ice/Handle.h +1 -1
  70. data/ext/ice/cpp/include/Ice/Ice.h +4 -3
  71. data/ext/ice/cpp/include/Ice/Identity.h +13 -5
  72. data/ext/ice/cpp/include/Ice/ImplicitContext.h +12 -4
  73. data/ext/ice/cpp/include/Ice/ImplicitContextF.h +12 -4
  74. data/ext/ice/cpp/include/Ice/Incoming.h +1 -1
  75. data/ext/ice/cpp/include/Ice/IncomingAsync.h +1 -1
  76. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
  77. data/ext/ice/cpp/include/Ice/Initialize.h +4 -2
  78. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
  79. data/ext/ice/cpp/include/Ice/Instrumentation.h +12 -4
  80. data/ext/ice/cpp/include/Ice/InstrumentationF.h +12 -4
  81. data/ext/ice/cpp/include/Ice/LocalException.h +12 -4
  82. data/ext/ice/cpp/include/Ice/LocalObject.h +1 -1
  83. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
  84. data/ext/ice/cpp/include/Ice/Locator.h +137 -129
  85. data/ext/ice/cpp/include/Ice/LocatorF.h +12 -4
  86. data/ext/ice/cpp/include/Ice/Logger.h +12 -4
  87. data/ext/ice/cpp/include/Ice/LoggerF.h +12 -4
  88. data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -1
  89. data/ext/ice/cpp/include/Ice/Metrics.h +144 -136
  90. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +1 -1
  91. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -1
  92. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +35 -26
  93. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -1
  94. data/ext/ice/cpp/include/Ice/Object.h +1 -1
  95. data/ext/ice/cpp/include/Ice/ObjectAdapter.h +12 -4
  96. data/ext/ice/cpp/include/Ice/ObjectAdapterF.h +12 -4
  97. data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +1 -1
  98. data/ext/ice/cpp/include/Ice/ObjectF.h +1 -1
  99. data/ext/ice/cpp/include/Ice/ObjectFactory.h +12 -4
  100. data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +12 -4
  101. data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +1 -1
  102. data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
  103. data/ext/ice/cpp/include/Ice/Outgoing.h +67 -39
  104. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +31 -34
  105. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +4 -4
  106. data/ext/ice/cpp/include/Ice/Plugin.h +12 -4
  107. data/ext/ice/cpp/include/Ice/PluginF.h +12 -4
  108. data/ext/ice/cpp/include/Ice/Process.h +36 -28
  109. data/ext/ice/cpp/include/Ice/ProcessF.h +12 -4
  110. data/ext/ice/cpp/include/Ice/Properties.h +12 -4
  111. data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +86 -78
  112. data/ext/ice/cpp/include/Ice/PropertiesF.h +12 -4
  113. data/ext/ice/cpp/include/Ice/Protocol.h +1 -1
  114. data/ext/ice/cpp/include/Ice/Proxy.h +6 -2
  115. data/ext/ice/cpp/include/Ice/ProxyF.h +1 -1
  116. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
  117. data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -1
  118. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
  119. data/ext/ice/cpp/include/Ice/RemoteLogger.h +137 -129
  120. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -1
  121. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -1
  122. data/ext/ice/cpp/include/Ice/Router.h +37 -29
  123. data/ext/ice/cpp/include/Ice/RouterF.h +12 -4
  124. data/ext/ice/cpp/include/Ice/ServantLocator.h +12 -4
  125. data/ext/ice/cpp/include/Ice/ServantLocatorF.h +12 -4
  126. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
  127. data/ext/ice/cpp/include/Ice/Service.h +1 -1
  128. data/ext/ice/cpp/include/Ice/SliceChecksumDict.h +12 -4
  129. data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
  130. data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
  131. data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -1
  132. data/ext/ice/cpp/include/Ice/Stream.h +3 -5
  133. data/ext/ice/cpp/include/Ice/StreamF.h +1 -1
  134. data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -1
  135. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
  136. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -1
  137. data/ext/ice/cpp/include/Ice/Version.h +14 -6
  138. data/ext/ice/cpp/include/IceSSL/Config.h +19 -1
  139. data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +61 -7
  140. data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +52 -5
  141. data/ext/ice/cpp/include/IceSSL/IceSSL.h +2 -2
  142. data/ext/ice/cpp/include/IceSSL/Plugin.h +32 -26
  143. data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +1 -1
  144. data/ext/ice/cpp/include/IceUtil/Atomic.h +186 -0
  145. data/ext/ice/cpp/include/IceUtil/Cache.h +1 -1
  146. data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
  147. data/ext/ice/cpp/include/IceUtil/Config.h +31 -20
  148. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
  149. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +1 -1
  150. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +9 -2
  151. data/ext/ice/cpp/include/IceUtil/Exception.h +4 -3
  152. data/ext/ice/cpp/include/IceUtil/Functional.h +1 -1
  153. data/ext/ice/cpp/include/IceUtil/Handle.h +1 -1
  154. data/ext/ice/cpp/include/IceUtil/IceUtil.h +2 -2
  155. data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +1 -1
  156. data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -1
  157. data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -1
  158. data/ext/ice/cpp/include/IceUtil/Lock.h +1 -1
  159. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -1
  160. data/ext/ice/cpp/include/IceUtil/Mutex.h +1 -1
  161. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -1
  162. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -1
  163. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -1
  164. data/ext/ice/cpp/include/IceUtil/Optional.h +1 -1
  165. data/ext/ice/cpp/include/IceUtil/Options.h +1 -1
  166. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +8 -11
  167. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
  168. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +5 -1
  169. data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
  170. data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -1
  171. data/ext/ice/cpp/include/IceUtil/SHA1.h +8 -26
  172. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +5 -5
  173. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
  174. data/ext/ice/cpp/include/IceUtil/Shared.h +3 -37
  175. data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -1
  176. data/ext/ice/cpp/include/IceUtil/Thread.h +1 -1
  177. data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -1
  178. data/ext/ice/cpp/include/IceUtil/Time.h +1 -1
  179. data/ext/ice/cpp/include/IceUtil/Timer.h +1 -1
  180. data/ext/ice/cpp/include/IceUtil/UUID.h +1 -1
  181. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
  182. data/ext/ice/cpp/include/IceUtil/UniquePtr.h +1 -1
  183. data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +7 -6
  184. data/ext/ice/cpp/include/Slice/Checksum.h +1 -1
  185. data/ext/ice/cpp/include/Slice/CsUtil.h +1 -1
  186. data/ext/ice/cpp/include/Slice/DotNetNames.h +1 -1
  187. data/ext/ice/cpp/include/Slice/FileTracker.h +1 -1
  188. data/ext/ice/cpp/include/Slice/JavaUtil.h +3 -1
  189. data/ext/ice/cpp/include/Slice/ObjCUtil.h +127 -0
  190. data/ext/ice/cpp/include/Slice/PHPUtil.h +1 -1
  191. data/ext/ice/cpp/include/Slice/Parser.h +18 -12
  192. data/ext/ice/cpp/include/Slice/Preprocessor.h +6 -4
  193. data/ext/ice/cpp/include/Slice/PythonUtil.h +1 -1
  194. data/ext/ice/cpp/include/Slice/RubyUtil.h +1 -1
  195. data/ext/ice/cpp/include/Slice/Util.h +20 -2
  196. data/ext/ice/cpp/src/Ice/ACM.cpp +1 -1
  197. data/ext/ice/cpp/src/Ice/ACM.h +1 -1
  198. data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
  199. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
  200. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
  201. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
  202. data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
  203. data/ext/ice/cpp/src/Ice/Base64.h +1 -1
  204. data/ext/ice/cpp/src/Ice/BasicStream.cpp +7 -5
  205. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +227 -0
  206. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +59 -0
  207. data/ext/ice/cpp/src/Ice/Buffer.cpp +3 -3
  208. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +10 -4
  209. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +82 -282
  210. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +8 -21
  211. data/ext/ice/cpp/src/Ice/Communicator.cpp +11 -5
  212. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +10 -4
  213. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +6 -6
  214. data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -1
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +42 -180
  216. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +10 -19
  217. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +25 -0
  218. data/ext/ice/cpp/src/Ice/Connection.cpp +17 -11
  219. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +10 -4
  220. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +137 -51
  221. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +18 -8
  222. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +105 -391
  223. data/ext/ice/cpp/src/Ice/ConnectionI.h +25 -23
  224. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +5 -29
  225. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +3 -8
  226. data/ext/ice/cpp/src/Ice/Connector.cpp +1 -1
  227. data/ext/ice/cpp/src/Ice/Connector.h +1 -1
  228. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
  229. data/ext/ice/cpp/src/Ice/Current.cpp +10 -4
  230. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -1
  231. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
  233. data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +1 -1
  234. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -1
  235. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
  236. data/ext/ice/cpp/src/Ice/Endpoint.cpp +17 -11
  237. data/ext/ice/cpp/src/Ice/EndpointF.cpp +10 -4
  238. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +19 -1
  239. data/ext/ice/cpp/src/Ice/EndpointFactory.h +13 -1
  240. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -1
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -1
  243. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
  244. data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -1
  245. data/ext/ice/cpp/src/Ice/EndpointI.h +33 -1
  246. data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
  247. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +10 -4
  248. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
  249. data/ext/ice/cpp/src/Ice/EventHandler.h +4 -1
  250. data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
  251. data/ext/ice/cpp/src/Ice/Exception.cpp +20 -11
  252. data/ext/ice/cpp/src/Ice/FacetMap.cpp +10 -4
  253. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
  254. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -2
  255. data/ext/ice/cpp/src/Ice/GCObject.cpp +1 -1
  256. data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
  257. data/ext/ice/cpp/src/Ice/HttpParser.cpp +27 -15
  258. data/ext/ice/cpp/src/Ice/HttpParser.h +4 -6
  259. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +7 -1
  260. data/ext/ice/cpp/src/Ice/IPEndpointI.h +2 -1
  261. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
  262. data/ext/ice/cpp/src/Ice/Identity.cpp +11 -5
  263. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +11 -5
  264. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +10 -4
  265. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -1
  266. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
  267. data/ext/ice/cpp/src/Ice/Incoming.cpp +22 -20
  268. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -1
  269. data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -1
  270. data/ext/ice/cpp/src/Ice/Initialize.cpp +31 -5
  271. data/ext/ice/cpp/src/Ice/Instance.cpp +102 -59
  272. data/ext/ice/cpp/src/Ice/Instance.h +28 -2
  273. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +20 -14
  274. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +10 -4
  275. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +1 -1
  276. data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -1
  277. data/ext/ice/cpp/src/Ice/LocalException.cpp +10 -4
  278. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
  279. data/ext/ice/cpp/src/Ice/Locator.cpp +83 -77
  280. data/ext/ice/cpp/src/Ice/LocatorF.cpp +10 -4
  281. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +77 -69
  282. data/ext/ice/cpp/src/Ice/LocatorInfo.h +1 -1
  283. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
  284. data/ext/ice/cpp/src/Ice/Logger.cpp +11 -5
  285. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -1
  286. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -1
  287. data/ext/ice/cpp/src/Ice/LoggerF.cpp +10 -4
  288. data/ext/ice/cpp/src/Ice/LoggerI.cpp +10 -8
  289. data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
  290. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +2 -2
  291. data/ext/ice/cpp/src/Ice/Metrics.cpp +122 -116
  292. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +1 -1
  293. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
  294. data/ext/ice/cpp/src/Ice/Network.cpp +63 -19
  295. data/ext/ice/cpp/src/Ice/Network.h +10 -3
  296. data/ext/ice/cpp/src/Ice/NetworkF.h +1 -1
  297. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +1 -1
  298. data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -1
  299. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
  300. data/ext/ice/cpp/src/Ice/Object.cpp +1 -1
  301. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +11 -5
  302. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +10 -4
  303. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +9 -9
  304. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +2 -2
  305. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +3 -3
  306. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +5 -5
  307. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +11 -5
  308. data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +10 -4
  309. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +9 -10
  310. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +1 -1
  311. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
  312. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +6 -5
  313. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -1
  314. data/ext/ice/cpp/src/Ice/Outgoing.cpp +209 -254
  315. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +120 -106
  316. data/ext/ice/cpp/src/Ice/Plugin.cpp +12 -6
  317. data/ext/ice/cpp/src/Ice/PluginF.cpp +10 -4
  318. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +21 -2
  319. data/ext/ice/cpp/src/Ice/Process.cpp +25 -19
  320. data/ext/ice/cpp/src/Ice/ProcessF.cpp +10 -4
  321. data/ext/ice/cpp/src/Ice/Properties.cpp +11 -5
  322. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +39 -33
  323. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +1 -1
  324. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -1
  325. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +10 -4
  326. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +1 -1
  327. data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -1
  328. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +12 -8
  329. data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
  330. data/ext/ice/cpp/src/Ice/Protocol.cpp +7 -7
  331. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +9 -6
  332. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +25 -7
  333. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
  334. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -1
  335. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -1
  336. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
  337. data/ext/ice/cpp/src/Ice/Proxy.cpp +32 -13
  338. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
  339. data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -1
  340. data/ext/ice/cpp/src/Ice/Reference.cpp +101 -86
  341. data/ext/ice/cpp/src/Ice/Reference.h +16 -9
  342. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -1
  343. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -1
  344. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
  345. data/ext/ice/cpp/src/Ice/RegisterPlugins.cpp +28 -0
  346. data/ext/ice/cpp/src/Ice/RegisterPlugins.h +25 -0
  347. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +92 -86
  348. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
  349. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -1
  350. data/ext/ice/cpp/src/Ice/RequestHandler.h +4 -8
  351. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +24 -16
  352. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +5 -4
  353. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
  354. data/ext/ice/cpp/src/Ice/ResponseHandler.h +3 -3
  355. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +16 -5
  356. data/ext/ice/cpp/src/Ice/RetryQueue.h +3 -2
  357. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
  358. data/ext/ice/cpp/src/Ice/Router.cpp +27 -21
  359. data/ext/ice/cpp/src/Ice/RouterF.cpp +10 -4
  360. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +1 -1
  361. data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -1
  362. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
  363. data/ext/ice/cpp/src/Ice/Selector.cpp +480 -1
  364. data/ext/ice/cpp/src/Ice/Selector.h +130 -1
  365. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +11 -5
  366. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +10 -4
  367. data/ext/ice/cpp/src/Ice/ServantManager.cpp +29 -23
  368. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
  369. data/ext/ice/cpp/src/Ice/SharedContext.h +1 -1
  370. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +10 -4
  371. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -1
  372. data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -1
  373. data/ext/ice/cpp/src/Ice/Stream.cpp +1 -1
  374. data/ext/ice/cpp/src/Ice/StreamI.cpp +1 -1
  375. data/ext/ice/cpp/src/Ice/StreamI.h +1 -1
  376. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +30 -22
  377. data/ext/ice/cpp/src/Ice/StreamSocket.h +7 -4
  378. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -1
  379. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +1 -1
  380. data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -1
  381. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +8 -8
  382. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -1
  383. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -1
  384. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -1
  385. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +21 -38
  386. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +5 -6
  387. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +29 -4
  388. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -2
  389. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +2 -2
  390. data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
  391. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -2
  392. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
  393. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -1
  394. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +16 -7
  395. data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -1
  396. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -1
  397. data/ext/ice/cpp/src/Ice/Transceiver.h +2 -1
  398. data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
  399. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +1 -1
  400. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -1
  401. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +13 -39
  402. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -5
  403. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +46 -10
  404. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +3 -2
  405. data/ext/ice/cpp/src/Ice/Version.cpp +12 -6
  406. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -1
  407. data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -1
  408. data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -1
  409. data/ext/ice/cpp/src/Ice/WSConnector.h +1 -1
  410. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +6 -38
  411. data/ext/ice/cpp/src/Ice/WSEndpoint.h +12 -1
  412. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +31 -35
  413. data/ext/ice/cpp/src/Ice/WSTransceiver.h +13 -1
  414. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +66 -60
  415. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +106 -100
  416. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
  417. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
  418. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +76 -36
  419. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
  420. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +19 -6
  421. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
  422. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +452 -0
  423. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +732 -0
  424. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +520 -0
  425. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.h +36 -0
  426. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +8 -8
  427. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
  428. data/ext/ice/cpp/src/IceSSL/Certificate.cpp +49 -47
  429. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +13 -5
  430. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -1
  431. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
  432. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +10 -38
  433. data/ext/ice/cpp/src/IceSSL/EndpointI.h +4 -3
  434. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +13 -5
  435. data/ext/ice/cpp/src/IceSSL/Instance.cpp +2 -2
  436. data/ext/ice/cpp/src/IceSSL/Instance.h +1 -1
  437. data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -1
  438. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +107 -111
  439. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +130 -47
  440. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +11 -3
  441. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +8 -14
  442. data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -1
  443. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -1
  444. data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -1
  445. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +238 -156
  446. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +93 -66
  447. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -3
  448. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +2 -2
  449. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +32 -35
  450. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
  451. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +244 -360
  452. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +59 -29
  453. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +8 -4
  454. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -1
  455. data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -1
  456. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -1
  457. data/ext/ice/cpp/src/IceSSL/Util.cpp +427 -620
  458. data/ext/ice/cpp/src/IceSSL/Util.h +72 -15
  459. data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +1 -1
  460. data/ext/ice/cpp/src/IceUtil/ArgVector.h +1 -1
  461. data/ext/ice/cpp/src/IceUtil/Cond.cpp +1 -1
  462. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
  463. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
  464. data/ext/ice/cpp/src/IceUtil/CountDownLatch.cpp +1 -1
  465. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
  466. data/ext/ice/cpp/src/IceUtil/Exception.cpp +105 -96
  467. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +2 -1
  468. data/ext/ice/cpp/src/IceUtil/FileUtil.h +9 -1
  469. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
  470. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
  471. data/ext/ice/cpp/src/IceUtil/Options.cpp +1 -1
  472. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +12 -25
  473. data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -1
  474. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +1 -1
  475. data/ext/ice/cpp/src/IceUtil/SHA1.cpp +72 -10
  476. data/ext/ice/cpp/src/IceUtil/Shared.cpp +3 -132
  477. data/ext/ice/cpp/src/IceUtil/StopWatch.h +1 -1
  478. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -1
  479. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +1 -1
  480. data/ext/ice/cpp/src/IceUtil/Thread.cpp +16 -1
  481. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -1
  482. data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
  483. data/ext/ice/cpp/src/IceUtil/Timer.cpp +1 -1
  484. data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -1
  485. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -1
  486. data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -1
  487. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +62 -55
  488. data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
  489. data/ext/ice/cpp/src/Slice/CsUtil.cpp +8 -29
  490. data/ext/ice/cpp/src/Slice/DotNetNames.cpp +1 -1
  491. data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
  492. data/ext/ice/cpp/src/Slice/Grammar.cpp +1 -1
  493. data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
  494. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +145 -172
  495. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
  496. data/ext/ice/cpp/src/Slice/MD5.h +1 -1
  497. data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +1310 -0
  498. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +1 -1
  499. data/ext/ice/cpp/src/Slice/Parser.cpp +65 -187
  500. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +61 -9
  501. data/ext/ice/cpp/src/Slice/Python.cpp +36 -3
  502. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +10 -10
  503. data/ext/ice/cpp/src/Slice/Ruby.cpp +34 -3
  504. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +8 -7
  505. data/ext/ice/cpp/src/Slice/Scanner.cpp +1 -1
  506. data/ext/ice/cpp/src/Slice/Util.cpp +137 -30
  507. data/ext/ice/mcpp/LICENSE +29 -0
  508. data/ext/ice/mcpp/Makefile +60 -0
  509. data/ext/ice/mcpp/Makefile.mak +46 -0
  510. data/ext/ice/mcpp/README.md +30 -0
  511. data/ext/ice/mcpp/config.h +89 -0
  512. data/ext/ice/mcpp/configed.H +1 -146
  513. data/ext/ice/mcpp/directive.c +115 -410
  514. data/ext/ice/mcpp/eval.c +38 -377
  515. data/ext/ice/mcpp/expand.c +155 -852
  516. data/ext/ice/mcpp/internal.H +10 -44
  517. data/ext/ice/mcpp/main.c +6 -345
  518. data/ext/ice/mcpp/mbchar.c +17 -654
  519. data/ext/ice/mcpp/mcpp.gyp +62 -0
  520. data/ext/ice/mcpp/support.c +116 -943
  521. data/ext/ice/mcpp/system.H +0 -23
  522. data/ext/ice/mcpp/system.c +81 -2321
  523. data/ice.gemspec +3 -4
  524. data/lib/Glacier2.rb +1 -1
  525. data/lib/Glacier2/Metrics.rb +2 -2
  526. data/lib/Glacier2/PermissionsVerifier.rb +2 -2
  527. data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
  528. data/lib/Glacier2/Router.rb +2 -2
  529. data/lib/Glacier2/RouterF.rb +2 -2
  530. data/lib/Glacier2/SSLInfo.rb +2 -2
  531. data/lib/Glacier2/Session.rb +2 -2
  532. data/lib/Ice.rb +1 -1
  533. data/lib/Ice/BuiltinSequences.rb +2 -2
  534. data/lib/Ice/Communicator.rb +2 -2
  535. data/lib/Ice/CommunicatorF.rb +2 -2
  536. data/lib/Ice/Connection.rb +26 -14
  537. data/lib/Ice/ConnectionF.rb +2 -2
  538. data/lib/Ice/Current.rb +2 -2
  539. data/lib/Ice/Endpoint.rb +4 -2
  540. data/lib/Ice/EndpointF.rb +2 -2
  541. data/lib/Ice/EndpointTypes.rb +2 -2
  542. data/lib/Ice/FacetMap.rb +2 -2
  543. data/lib/Ice/Identity.rb +2 -2
  544. data/lib/Ice/ImplicitContext.rb +2 -2
  545. data/lib/Ice/ImplicitContextF.rb +2 -2
  546. data/lib/Ice/Instrumentation.rb +2 -2
  547. data/lib/Ice/InstrumentationF.rb +2 -2
  548. data/lib/Ice/LocalException.rb +2 -2
  549. data/lib/Ice/Locator.rb +2 -2
  550. data/lib/Ice/LocatorF.rb +2 -2
  551. data/lib/Ice/Logger.rb +2 -2
  552. data/lib/Ice/LoggerF.rb +2 -2
  553. data/lib/Ice/Metrics.rb +2 -2
  554. data/lib/Ice/ObjectAdapterF.rb +2 -2
  555. data/lib/Ice/ObjectFactory.rb +2 -2
  556. data/lib/Ice/ObjectFactoryF.rb +2 -2
  557. data/lib/Ice/Plugin.rb +2 -2
  558. data/lib/Ice/PluginF.rb +2 -2
  559. data/lib/Ice/Process.rb +2 -2
  560. data/lib/Ice/ProcessF.rb +2 -2
  561. data/lib/Ice/Properties.rb +2 -2
  562. data/lib/Ice/PropertiesAdmin.rb +2 -2
  563. data/lib/Ice/PropertiesF.rb +2 -2
  564. data/lib/Ice/Router.rb +2 -2
  565. data/lib/Ice/RouterF.rb +2 -2
  566. data/lib/Ice/SliceChecksumDict.rb +2 -2
  567. data/lib/Ice/Version.rb +2 -2
  568. data/lib/IceBox.rb +1 -1
  569. data/lib/IceBox/IceBox.rb +2 -2
  570. data/lib/IceGrid.rb +1 -1
  571. data/lib/IceGrid/Admin.rb +2 -2
  572. data/lib/IceGrid/Descriptor.rb +2 -2
  573. data/lib/IceGrid/Exception.rb +2 -2
  574. data/lib/IceGrid/FileParser.rb +2 -2
  575. data/lib/IceGrid/Locator.rb +2 -2
  576. data/lib/IceGrid/Observer.rb +2 -2
  577. data/lib/IceGrid/Query.rb +2 -2
  578. data/lib/IceGrid/Registry.rb +2 -2
  579. data/lib/IceGrid/Session.rb +2 -2
  580. data/lib/IceGrid/UserAccountMapper.rb +2 -2
  581. data/lib/IcePatch2.rb +1 -1
  582. data/lib/IcePatch2/FileInfo.rb +52 -2
  583. data/lib/IcePatch2/FileServer.rb +33 -4
  584. data/lib/IceStorm.rb +1 -1
  585. data/lib/IceStorm/IceStorm.rb +2 -2
  586. data/lib/IceStorm/Metrics.rb +2 -2
  587. data/slice/Freeze/BackgroundSaveEvictor.ice +2 -2
  588. data/slice/Freeze/CatalogData.ice +2 -2
  589. data/slice/Freeze/Connection.ice +2 -2
  590. data/slice/Freeze/ConnectionF.ice +2 -2
  591. data/slice/Freeze/DB.ice +2 -2
  592. data/slice/Freeze/Evictor.ice +2 -2
  593. data/slice/Freeze/EvictorF.ice +2 -2
  594. data/slice/Freeze/EvictorStorage.ice +2 -2
  595. data/slice/Freeze/Exception.ice +2 -2
  596. data/slice/Freeze/Transaction.ice +2 -2
  597. data/slice/Freeze/TransactionalEvictor.ice +2 -2
  598. data/slice/Glacier2/Metrics.ice +7 -6
  599. data/slice/Glacier2/PermissionsVerifier.ice +4 -3
  600. data/slice/Glacier2/PermissionsVerifierF.ice +3 -2
  601. data/slice/Glacier2/Router.ice +4 -3
  602. data/slice/Glacier2/RouterF.ice +3 -2
  603. data/slice/Glacier2/SSLInfo.ice +3 -2
  604. data/slice/Glacier2/Session.ice +12 -11
  605. data/slice/Ice/BuiltinSequences.ice +4 -3
  606. data/slice/Ice/Communicator.ice +22 -25
  607. data/slice/Ice/CommunicatorF.ice +3 -2
  608. data/slice/Ice/Connection.ice +39 -11
  609. data/slice/Ice/ConnectionF.ice +3 -2
  610. data/slice/Ice/Current.ice +4 -3
  611. data/slice/Ice/Endpoint.ice +11 -3
  612. data/slice/Ice/EndpointF.ice +3 -2
  613. data/slice/Ice/EndpointTypes.ice +3 -2
  614. data/slice/Ice/FacetMap.ice +3 -2
  615. data/slice/Ice/Identity.ice +3 -2
  616. data/slice/Ice/ImplicitContext.ice +3 -2
  617. data/slice/Ice/ImplicitContextF.ice +3 -2
  618. data/slice/Ice/Instrumentation.ice +4 -2
  619. data/slice/Ice/InstrumentationF.ice +4 -2
  620. data/slice/Ice/LocalException.ice +29 -10
  621. data/slice/Ice/Locator.ice +5 -3
  622. data/slice/Ice/LocatorF.ice +3 -2
  623. data/slice/Ice/Logger.ice +3 -2
  624. data/slice/Ice/LoggerF.ice +3 -2
  625. data/slice/Ice/Metrics.ice +15 -14
  626. data/slice/Ice/ObjectAdapter.ice +5 -4
  627. data/slice/Ice/ObjectAdapterF.ice +3 -2
  628. data/slice/Ice/ObjectFactory.ice +3 -2
  629. data/slice/Ice/ObjectFactoryF.ice +3 -2
  630. data/slice/Ice/Plugin.ice +3 -2
  631. data/slice/Ice/PluginF.ice +3 -2
  632. data/slice/Ice/Process.ice +3 -2
  633. data/slice/Ice/ProcessF.ice +3 -2
  634. data/slice/Ice/Properties.ice +3 -2
  635. data/slice/Ice/PropertiesAdmin.ice +3 -2
  636. data/slice/Ice/PropertiesF.ice +3 -2
  637. data/slice/Ice/RemoteLogger.ice +3 -2
  638. data/slice/Ice/Router.ice +3 -2
  639. data/slice/Ice/RouterF.ice +3 -2
  640. data/slice/Ice/ServantLocator.ice +3 -2
  641. data/slice/Ice/ServantLocatorF.ice +3 -2
  642. data/slice/Ice/SliceChecksumDict.ice +3 -2
  643. data/slice/Ice/Version.ice +3 -2
  644. data/slice/IceBox/IceBox.ice +2 -2
  645. data/slice/IceDiscovery/IceDiscovery.ice +2 -2
  646. data/slice/IceGrid/Admin.ice +49 -48
  647. data/slice/IceGrid/Descriptor.ice +3 -2
  648. data/slice/IceGrid/Exception.ice +6 -5
  649. data/slice/IceGrid/FileParser.ice +4 -3
  650. data/slice/IceGrid/Locator.ice +4 -3
  651. data/slice/IceGrid/Observer.ice +28 -27
  652. data/slice/IceGrid/PluginFacade.ice +3 -2
  653. data/slice/IceGrid/Query.ice +3 -2
  654. data/slice/IceGrid/Registry.ice +4 -3
  655. data/slice/IceGrid/Session.ice +9 -8
  656. data/slice/IceGrid/UserAccountMapper.ice +4 -3
  657. data/slice/{IceGrid/Discovery.ice → IceLocatorDiscovery/IceLocatorDiscovery.ice} +12 -14
  658. data/slice/IcePatch2/FileInfo.ice +31 -2
  659. data/slice/IcePatch2/FileServer.ice +63 -5
  660. data/slice/IceSSL/ConnectionInfo.ice +17 -2
  661. data/slice/IceSSL/EndpointInfo.ice +21 -3
  662. data/slice/IceStorm/IceStorm.ice +3 -2
  663. data/slice/IceStorm/Metrics.ice +4 -3
  664. metadata +27 -23
  665. data/ext/ice/cpp/include/Ice/Makefile +0 -26
  666. data/ext/ice/cpp/include/IceSSL/Makefile +0 -26
  667. data/ext/ice/cpp/include/IceUtil/Makefile +0 -26
  668. data/ext/ice/cpp/include/Slice/Makefile +0 -26
  669. data/ext/ice/cpp/src/Ice/Application.cpp +0 -760
  670. data/ext/ice/cpp/src/Ice/EventLoggerMsg.h +0 -53
  671. data/ext/ice/cpp/src/Ice/Makefile +0 -190
  672. data/ext/ice/cpp/src/Ice/Service.cpp +0 -1897
  673. data/ext/ice/cpp/src/IceDiscovery/Makefile +0 -61
  674. data/ext/ice/cpp/src/IceSSL/Makefile +0 -82
  675. data/ext/ice/cpp/src/IceUtil/Makefile +0 -68
  676. data/ext/ice/cpp/src/Slice/Makefile +0 -65
  677. data/ext/ice/mcpp/config.h.Darwin +0 -227
  678. data/ext/ice/mcpp/config.h.Linux +0 -227
  679. data/ext/ice/mcpp/config.h.MINGW +0 -7
@@ -0,0 +1,732 @@
1
+ // **********************************************************************
2
+ //
3
+ // Copyright (c) 2003-2015 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.6.0
11
+ //
12
+ // <auto-generated>
13
+ //
14
+ // Generated from file `IceLocatorDiscovery.ice'
15
+ //
16
+ // Warning: do not edit this file.
17
+ //
18
+ // </auto-generated>
19
+ //
20
+
21
+ #ifndef __IceLocatorDiscovery_IceLocatorDiscovery_h__
22
+ #define __IceLocatorDiscovery_IceLocatorDiscovery_h__
23
+
24
+ #include <IceUtil/PushDisableWarnings.h>
25
+ #include <Ice/ProxyF.h>
26
+ #include <Ice/ObjectF.h>
27
+ #include <Ice/Exception.h>
28
+ #include <Ice/LocalObject.h>
29
+ #include <Ice/StreamHelpers.h>
30
+ #include <Ice/Proxy.h>
31
+ #include <Ice/GCObject.h>
32
+ #include <Ice/AsyncResult.h>
33
+ #include <Ice/Incoming.h>
34
+ #include <Ice/IncomingAsync.h>
35
+ #include <Ice/FactoryTableInit.h>
36
+ #include <IceUtil/ScopedArray.h>
37
+ #include <IceUtil/Optional.h>
38
+ #include <Ice/StreamF.h>
39
+ #include <Ice/Locator.h>
40
+ #include <IceUtil/UndefSysMacros.h>
41
+
42
+ #ifndef ICE_IGNORE_VERSION
43
+ # if ICE_INT_VERSION / 100 != 306
44
+ # error Ice version mismatch!
45
+ # endif
46
+ # if ICE_INT_VERSION % 100 > 50
47
+ # error Beta header file detected
48
+ # endif
49
+ # if ICE_INT_VERSION % 100 < 0
50
+ # error Ice patch level mismatch!
51
+ # endif
52
+ #endif
53
+
54
+ namespace IceProxy
55
+ {
56
+
57
+ namespace IceLocatorDiscovery
58
+ {
59
+
60
+ class LookupReply;
61
+ void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>&);
62
+ ::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::LookupReply*);
63
+
64
+ class Lookup;
65
+ void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>&);
66
+ ::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::Lookup*);
67
+
68
+ }
69
+
70
+ }
71
+
72
+ namespace IceLocatorDiscovery
73
+ {
74
+
75
+ class LookupReply;
76
+ bool operator==(const LookupReply&, const LookupReply&);
77
+ bool operator<(const LookupReply&, const LookupReply&);
78
+ ::Ice::Object* upCast(::IceLocatorDiscovery::LookupReply*);
79
+ typedef ::IceInternal::Handle< ::IceLocatorDiscovery::LookupReply> LookupReplyPtr;
80
+ typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply> LookupReplyPrx;
81
+ void __patch(LookupReplyPtr&, const ::Ice::ObjectPtr&);
82
+
83
+ class Lookup;
84
+ bool operator==(const Lookup&, const Lookup&);
85
+ bool operator<(const Lookup&, const Lookup&);
86
+ ::Ice::Object* upCast(::IceLocatorDiscovery::Lookup*);
87
+ typedef ::IceInternal::Handle< ::IceLocatorDiscovery::Lookup> LookupPtr;
88
+ typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup> LookupPrx;
89
+ void __patch(LookupPtr&, const ::Ice::ObjectPtr&);
90
+
91
+ }
92
+
93
+ namespace IceAsync
94
+ {
95
+
96
+ }
97
+
98
+ namespace IceLocatorDiscovery
99
+ {
100
+
101
+ class Callback_LookupReply_foundLocator_Base : virtual public ::IceInternal::CallbackBase { };
102
+ typedef ::IceUtil::Handle< Callback_LookupReply_foundLocator_Base> Callback_LookupReply_foundLocatorPtr;
103
+
104
+ class Callback_Lookup_findLocator_Base : virtual public ::IceInternal::CallbackBase { };
105
+ typedef ::IceUtil::Handle< Callback_Lookup_findLocator_Base> Callback_Lookup_findLocatorPtr;
106
+
107
+ }
108
+
109
+ namespace IceProxy
110
+ {
111
+
112
+ namespace IceLocatorDiscovery
113
+ {
114
+
115
+ class LookupReply : virtual public ::IceProxy::Ice::Object
116
+ {
117
+ public:
118
+
119
+ void foundLocator(const ::Ice::LocatorPrx& __p_prx)
120
+ {
121
+ foundLocator(__p_prx, 0);
122
+ }
123
+ void foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx)
124
+ {
125
+ foundLocator(__p_prx, &__ctx);
126
+ }
127
+ #ifdef ICE_CPP11
128
+ ::Ice::AsyncResultPtr
129
+ begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
130
+ {
131
+ return begin_foundLocator(__p_prx, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
132
+ }
133
+ ::Ice::AsyncResultPtr
134
+ begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
135
+ {
136
+ return begin_foundLocator(__p_prx, 0, ::Ice::newCallback(__completed, __sent), 0);
137
+ }
138
+ ::Ice::AsyncResultPtr
139
+ begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
140
+ {
141
+ return begin_foundLocator(__p_prx, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
142
+ }
143
+ ::Ice::AsyncResultPtr
144
+ begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
145
+ {
146
+ return begin_foundLocator(__p_prx, &__ctx, ::Ice::newCallback(__completed, __sent));
147
+ }
148
+ #endif
149
+
150
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx)
151
+ {
152
+ return begin_foundLocator(__p_prx, 0, ::IceInternal::__dummyCallback, 0);
153
+ }
154
+
155
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx)
156
+ {
157
+ return begin_foundLocator(__p_prx, &__ctx, ::IceInternal::__dummyCallback, 0);
158
+ }
159
+
160
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
161
+ {
162
+ return begin_foundLocator(__p_prx, 0, __del, __cookie);
163
+ }
164
+
165
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
166
+ {
167
+ return begin_foundLocator(__p_prx, &__ctx, __del, __cookie);
168
+ }
169
+
170
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
171
+ {
172
+ return begin_foundLocator(__p_prx, 0, __del, __cookie);
173
+ }
174
+
175
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
176
+ {
177
+ return begin_foundLocator(__p_prx, &__ctx, __del, __cookie);
178
+ }
179
+
180
+ void end_foundLocator(const ::Ice::AsyncResultPtr&);
181
+
182
+ private:
183
+
184
+ void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context*);
185
+ ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context*, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& __cookie = 0);
186
+
187
+ public:
188
+
189
+ ::IceInternal::ProxyHandle<LookupReply> ice_context(const ::Ice::Context& __context) const
190
+ {
191
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_context(__context).get());
192
+ }
193
+
194
+ ::IceInternal::ProxyHandle<LookupReply> ice_adapterId(const ::std::string& __id) const
195
+ {
196
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
197
+ }
198
+
199
+ ::IceInternal::ProxyHandle<LookupReply> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const
200
+ {
201
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());
202
+ }
203
+
204
+ ::IceInternal::ProxyHandle<LookupReply> ice_locatorCacheTimeout(int __timeout) const
205
+ {
206
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());
207
+ }
208
+
209
+ ::IceInternal::ProxyHandle<LookupReply> ice_connectionCached(bool __cached) const
210
+ {
211
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());
212
+ }
213
+
214
+ ::IceInternal::ProxyHandle<LookupReply> ice_endpointSelection(::Ice::EndpointSelectionType __est) const
215
+ {
216
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());
217
+ }
218
+
219
+ ::IceInternal::ProxyHandle<LookupReply> ice_secure(bool __secure) const
220
+ {
221
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
222
+ }
223
+
224
+ ::IceInternal::ProxyHandle<LookupReply> ice_preferSecure(bool __preferSecure) const
225
+ {
226
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());
227
+ }
228
+
229
+ ::IceInternal::ProxyHandle<LookupReply> ice_router(const ::Ice::RouterPrx& __router) const
230
+ {
231
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_router(__router).get());
232
+ }
233
+
234
+ ::IceInternal::ProxyHandle<LookupReply> ice_locator(const ::Ice::LocatorPrx& __locator) const
235
+ {
236
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
237
+ }
238
+
239
+ ::IceInternal::ProxyHandle<LookupReply> ice_collocationOptimized(bool __co) const
240
+ {
241
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());
242
+ }
243
+
244
+ ::IceInternal::ProxyHandle<LookupReply> ice_invocationTimeout(int __timeout) const
245
+ {
246
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_invocationTimeout(__timeout).get());
247
+ }
248
+
249
+ ::IceInternal::ProxyHandle<LookupReply> ice_twoway() const
250
+ {
251
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_twoway().get());
252
+ }
253
+
254
+ ::IceInternal::ProxyHandle<LookupReply> ice_oneway() const
255
+ {
256
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_oneway().get());
257
+ }
258
+
259
+ ::IceInternal::ProxyHandle<LookupReply> ice_batchOneway() const
260
+ {
261
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_batchOneway().get());
262
+ }
263
+
264
+ ::IceInternal::ProxyHandle<LookupReply> ice_datagram() const
265
+ {
266
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_datagram().get());
267
+ }
268
+
269
+ ::IceInternal::ProxyHandle<LookupReply> ice_batchDatagram() const
270
+ {
271
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
272
+ }
273
+
274
+ ::IceInternal::ProxyHandle<LookupReply> ice_compress(bool __compress) const
275
+ {
276
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_compress(__compress).get());
277
+ }
278
+
279
+ ::IceInternal::ProxyHandle<LookupReply> ice_timeout(int __timeout) const
280
+ {
281
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
282
+ }
283
+
284
+ ::IceInternal::ProxyHandle<LookupReply> ice_connectionId(const ::std::string& __id) const
285
+ {
286
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());
287
+ }
288
+
289
+ ::IceInternal::ProxyHandle<LookupReply> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const
290
+ {
291
+ return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());
292
+ }
293
+
294
+ static const ::std::string& ice_staticId();
295
+
296
+ private:
297
+ virtual ::IceProxy::Ice::Object* __newInstance() const;
298
+ };
299
+
300
+ class Lookup : virtual public ::IceProxy::Ice::Object
301
+ {
302
+ public:
303
+
304
+ void findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply)
305
+ {
306
+ findLocator(__p_instanceName, __p_reply, 0);
307
+ }
308
+ void findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
309
+ {
310
+ findLocator(__p_instanceName, __p_reply, &__ctx);
311
+ }
312
+ #ifdef ICE_CPP11
313
+ ::Ice::AsyncResultPtr
314
+ begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
315
+ {
316
+ return begin_findLocator(__p_instanceName, __p_reply, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
317
+ }
318
+ ::Ice::AsyncResultPtr
319
+ begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
320
+ {
321
+ return begin_findLocator(__p_instanceName, __p_reply, 0, ::Ice::newCallback(__completed, __sent), 0);
322
+ }
323
+ ::Ice::AsyncResultPtr
324
+ begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
325
+ {
326
+ return begin_findLocator(__p_instanceName, __p_reply, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
327
+ }
328
+ ::Ice::AsyncResultPtr
329
+ begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
330
+ {
331
+ return begin_findLocator(__p_instanceName, __p_reply, &__ctx, ::Ice::newCallback(__completed, __sent));
332
+ }
333
+ #endif
334
+
335
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply)
336
+ {
337
+ return begin_findLocator(__p_instanceName, __p_reply, 0, ::IceInternal::__dummyCallback, 0);
338
+ }
339
+
340
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
341
+ {
342
+ return begin_findLocator(__p_instanceName, __p_reply, &__ctx, ::IceInternal::__dummyCallback, 0);
343
+ }
344
+
345
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
346
+ {
347
+ return begin_findLocator(__p_instanceName, __p_reply, 0, __del, __cookie);
348
+ }
349
+
350
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
351
+ {
352
+ return begin_findLocator(__p_instanceName, __p_reply, &__ctx, __del, __cookie);
353
+ }
354
+
355
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
356
+ {
357
+ return begin_findLocator(__p_instanceName, __p_reply, 0, __del, __cookie);
358
+ }
359
+
360
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
361
+ {
362
+ return begin_findLocator(__p_instanceName, __p_reply, &__ctx, __del, __cookie);
363
+ }
364
+
365
+ void end_findLocator(const ::Ice::AsyncResultPtr&);
366
+
367
+ private:
368
+
369
+ void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context*);
370
+ ::Ice::AsyncResultPtr begin_findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context*, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& __cookie = 0);
371
+
372
+ public:
373
+
374
+ ::IceInternal::ProxyHandle<Lookup> ice_context(const ::Ice::Context& __context) const
375
+ {
376
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_context(__context).get());
377
+ }
378
+
379
+ ::IceInternal::ProxyHandle<Lookup> ice_adapterId(const ::std::string& __id) const
380
+ {
381
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
382
+ }
383
+
384
+ ::IceInternal::ProxyHandle<Lookup> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const
385
+ {
386
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());
387
+ }
388
+
389
+ ::IceInternal::ProxyHandle<Lookup> ice_locatorCacheTimeout(int __timeout) const
390
+ {
391
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());
392
+ }
393
+
394
+ ::IceInternal::ProxyHandle<Lookup> ice_connectionCached(bool __cached) const
395
+ {
396
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());
397
+ }
398
+
399
+ ::IceInternal::ProxyHandle<Lookup> ice_endpointSelection(::Ice::EndpointSelectionType __est) const
400
+ {
401
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());
402
+ }
403
+
404
+ ::IceInternal::ProxyHandle<Lookup> ice_secure(bool __secure) const
405
+ {
406
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
407
+ }
408
+
409
+ ::IceInternal::ProxyHandle<Lookup> ice_preferSecure(bool __preferSecure) const
410
+ {
411
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());
412
+ }
413
+
414
+ ::IceInternal::ProxyHandle<Lookup> ice_router(const ::Ice::RouterPrx& __router) const
415
+ {
416
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_router(__router).get());
417
+ }
418
+
419
+ ::IceInternal::ProxyHandle<Lookup> ice_locator(const ::Ice::LocatorPrx& __locator) const
420
+ {
421
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
422
+ }
423
+
424
+ ::IceInternal::ProxyHandle<Lookup> ice_collocationOptimized(bool __co) const
425
+ {
426
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());
427
+ }
428
+
429
+ ::IceInternal::ProxyHandle<Lookup> ice_invocationTimeout(int __timeout) const
430
+ {
431
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_invocationTimeout(__timeout).get());
432
+ }
433
+
434
+ ::IceInternal::ProxyHandle<Lookup> ice_twoway() const
435
+ {
436
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_twoway().get());
437
+ }
438
+
439
+ ::IceInternal::ProxyHandle<Lookup> ice_oneway() const
440
+ {
441
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_oneway().get());
442
+ }
443
+
444
+ ::IceInternal::ProxyHandle<Lookup> ice_batchOneway() const
445
+ {
446
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_batchOneway().get());
447
+ }
448
+
449
+ ::IceInternal::ProxyHandle<Lookup> ice_datagram() const
450
+ {
451
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_datagram().get());
452
+ }
453
+
454
+ ::IceInternal::ProxyHandle<Lookup> ice_batchDatagram() const
455
+ {
456
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
457
+ }
458
+
459
+ ::IceInternal::ProxyHandle<Lookup> ice_compress(bool __compress) const
460
+ {
461
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_compress(__compress).get());
462
+ }
463
+
464
+ ::IceInternal::ProxyHandle<Lookup> ice_timeout(int __timeout) const
465
+ {
466
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
467
+ }
468
+
469
+ ::IceInternal::ProxyHandle<Lookup> ice_connectionId(const ::std::string& __id) const
470
+ {
471
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());
472
+ }
473
+
474
+ ::IceInternal::ProxyHandle<Lookup> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const
475
+ {
476
+ return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());
477
+ }
478
+
479
+ static const ::std::string& ice_staticId();
480
+
481
+ private:
482
+ virtual ::IceProxy::Ice::Object* __newInstance() const;
483
+ };
484
+
485
+ }
486
+
487
+ }
488
+
489
+ namespace IceLocatorDiscovery
490
+ {
491
+
492
+ class LookupReply : virtual public ::Ice::Object
493
+ {
494
+ public:
495
+
496
+ typedef LookupReplyPrx ProxyType;
497
+ typedef LookupReplyPtr PointerType;
498
+
499
+ virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
500
+ virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
501
+ virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
502
+ static const ::std::string& ice_staticId();
503
+
504
+ virtual void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Current& = ::Ice::Current()) = 0;
505
+ ::Ice::DispatchStatus ___foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
506
+
507
+ virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
508
+
509
+ protected:
510
+ virtual void __writeImpl(::IceInternal::BasicStream*) const;
511
+ virtual void __readImpl(::IceInternal::BasicStream*);
512
+ using ::Ice::Object::__writeImpl;
513
+ using ::Ice::Object::__readImpl;
514
+ };
515
+
516
+ inline bool operator==(const LookupReply& l, const LookupReply& r)
517
+ {
518
+ return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
519
+ }
520
+
521
+ inline bool operator<(const LookupReply& l, const LookupReply& r)
522
+ {
523
+ return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
524
+ }
525
+
526
+ class Lookup : virtual public ::Ice::Object
527
+ {
528
+ public:
529
+
530
+ typedef LookupPrx ProxyType;
531
+ typedef LookupPtr PointerType;
532
+
533
+ virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
534
+ virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
535
+ virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
536
+ static const ::std::string& ice_staticId();
537
+
538
+ virtual void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Current& = ::Ice::Current()) = 0;
539
+ ::Ice::DispatchStatus ___findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
540
+
541
+ virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
542
+
543
+ protected:
544
+ virtual void __writeImpl(::IceInternal::BasicStream*) const;
545
+ virtual void __readImpl(::IceInternal::BasicStream*);
546
+ using ::Ice::Object::__writeImpl;
547
+ using ::Ice::Object::__readImpl;
548
+ };
549
+
550
+ inline bool operator==(const Lookup& l, const Lookup& r)
551
+ {
552
+ return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
553
+ }
554
+
555
+ inline bool operator<(const Lookup& l, const Lookup& r)
556
+ {
557
+ return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
558
+ }
559
+
560
+ }
561
+
562
+ namespace IceLocatorDiscovery
563
+ {
564
+
565
+ template<class T>
566
+ class CallbackNC_LookupReply_foundLocator : public Callback_LookupReply_foundLocator_Base, public ::IceInternal::OnewayCallbackNC<T>
567
+ {
568
+ public:
569
+
570
+ typedef IceUtil::Handle<T> TPtr;
571
+
572
+ typedef void (T::*Exception)(const ::Ice::Exception&);
573
+ typedef void (T::*Sent)(bool);
574
+ typedef void (T::*Response)();
575
+
576
+ CallbackNC_LookupReply_foundLocator(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
577
+ : ::IceInternal::OnewayCallbackNC<T>(obj, cb, excb, sentcb)
578
+ {
579
+ }
580
+ };
581
+
582
+ template<class T> Callback_LookupReply_foundLocatorPtr
583
+ newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
584
+ {
585
+ return new CallbackNC_LookupReply_foundLocator<T>(instance, cb, excb, sentcb);
586
+ }
587
+
588
+ template<class T> Callback_LookupReply_foundLocatorPtr
589
+ newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
590
+ {
591
+ return new CallbackNC_LookupReply_foundLocator<T>(instance, 0, excb, sentcb);
592
+ }
593
+
594
+ template<class T> Callback_LookupReply_foundLocatorPtr
595
+ newCallback_LookupReply_foundLocator(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
596
+ {
597
+ return new CallbackNC_LookupReply_foundLocator<T>(instance, cb, excb, sentcb);
598
+ }
599
+
600
+ template<class T> Callback_LookupReply_foundLocatorPtr
601
+ newCallback_LookupReply_foundLocator(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
602
+ {
603
+ return new CallbackNC_LookupReply_foundLocator<T>(instance, 0, excb, sentcb);
604
+ }
605
+
606
+ template<class T, typename CT>
607
+ class Callback_LookupReply_foundLocator : public Callback_LookupReply_foundLocator_Base, public ::IceInternal::OnewayCallback<T, CT>
608
+ {
609
+ public:
610
+
611
+ typedef IceUtil::Handle<T> TPtr;
612
+
613
+ typedef void (T::*Exception)(const ::Ice::Exception& , const CT&);
614
+ typedef void (T::*Sent)(bool , const CT&);
615
+ typedef void (T::*Response)(const CT&);
616
+
617
+ Callback_LookupReply_foundLocator(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
618
+ : ::IceInternal::OnewayCallback<T, CT>(obj, cb, excb, sentcb)
619
+ {
620
+ }
621
+ };
622
+
623
+ template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
624
+ newCallback_LookupReply_foundLocator(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)
625
+ {
626
+ return new Callback_LookupReply_foundLocator<T, CT>(instance, cb, excb, sentcb);
627
+ }
628
+
629
+ template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
630
+ newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
631
+ {
632
+ return new Callback_LookupReply_foundLocator<T, CT>(instance, 0, excb, sentcb);
633
+ }
634
+
635
+ template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
636
+ newCallback_LookupReply_foundLocator(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
637
+ {
638
+ return new Callback_LookupReply_foundLocator<T, CT>(instance, cb, excb, sentcb);
639
+ }
640
+
641
+ template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
642
+ newCallback_LookupReply_foundLocator(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
643
+ {
644
+ return new Callback_LookupReply_foundLocator<T, CT>(instance, 0, excb, sentcb);
645
+ }
646
+
647
+ template<class T>
648
+ class CallbackNC_Lookup_findLocator : public Callback_Lookup_findLocator_Base, public ::IceInternal::OnewayCallbackNC<T>
649
+ {
650
+ public:
651
+
652
+ typedef IceUtil::Handle<T> TPtr;
653
+
654
+ typedef void (T::*Exception)(const ::Ice::Exception&);
655
+ typedef void (T::*Sent)(bool);
656
+ typedef void (T::*Response)();
657
+
658
+ CallbackNC_Lookup_findLocator(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
659
+ : ::IceInternal::OnewayCallbackNC<T>(obj, cb, excb, sentcb)
660
+ {
661
+ }
662
+ };
663
+
664
+ template<class T> Callback_Lookup_findLocatorPtr
665
+ newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
666
+ {
667
+ return new CallbackNC_Lookup_findLocator<T>(instance, cb, excb, sentcb);
668
+ }
669
+
670
+ template<class T> Callback_Lookup_findLocatorPtr
671
+ newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
672
+ {
673
+ return new CallbackNC_Lookup_findLocator<T>(instance, 0, excb, sentcb);
674
+ }
675
+
676
+ template<class T> Callback_Lookup_findLocatorPtr
677
+ newCallback_Lookup_findLocator(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
678
+ {
679
+ return new CallbackNC_Lookup_findLocator<T>(instance, cb, excb, sentcb);
680
+ }
681
+
682
+ template<class T> Callback_Lookup_findLocatorPtr
683
+ newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
684
+ {
685
+ return new CallbackNC_Lookup_findLocator<T>(instance, 0, excb, sentcb);
686
+ }
687
+
688
+ template<class T, typename CT>
689
+ class Callback_Lookup_findLocator : public Callback_Lookup_findLocator_Base, public ::IceInternal::OnewayCallback<T, CT>
690
+ {
691
+ public:
692
+
693
+ typedef IceUtil::Handle<T> TPtr;
694
+
695
+ typedef void (T::*Exception)(const ::Ice::Exception& , const CT&);
696
+ typedef void (T::*Sent)(bool , const CT&);
697
+ typedef void (T::*Response)(const CT&);
698
+
699
+ Callback_Lookup_findLocator(const TPtr& obj, Response cb, Exception excb, Sent sentcb)
700
+ : ::IceInternal::OnewayCallback<T, CT>(obj, cb, excb, sentcb)
701
+ {
702
+ }
703
+ };
704
+
705
+ template<class T, typename CT> Callback_Lookup_findLocatorPtr
706
+ newCallback_Lookup_findLocator(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)
707
+ {
708
+ return new Callback_Lookup_findLocator<T, CT>(instance, cb, excb, sentcb);
709
+ }
710
+
711
+ template<class T, typename CT> Callback_Lookup_findLocatorPtr
712
+ newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
713
+ {
714
+ return new Callback_Lookup_findLocator<T, CT>(instance, 0, excb, sentcb);
715
+ }
716
+
717
+ template<class T, typename CT> Callback_Lookup_findLocatorPtr
718
+ newCallback_Lookup_findLocator(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
719
+ {
720
+ return new Callback_Lookup_findLocator<T, CT>(instance, cb, excb, sentcb);
721
+ }
722
+
723
+ template<class T, typename CT> Callback_Lookup_findLocatorPtr
724
+ newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
725
+ {
726
+ return new Callback_Lookup_findLocator<T, CT>(instance, 0, excb, sentcb);
727
+ }
728
+
729
+ }
730
+
731
+ #include <IceUtil/PopDisableWarnings.h>
732
+ #endif