zeroc-ice 3.7.1 → 3.7.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (683) hide show
  1. checksums.yaml +5 -5
  2. data/ICE_LICENSE +1 -1
  3. data/bin/slice2rb +1 -6
  4. data/ext/Communicator.cpp +7 -9
  5. data/ext/Communicator.h +1 -6
  6. data/ext/Config.h +28 -6
  7. data/ext/Connection.cpp +1 -10
  8. data/ext/Connection.h +1 -6
  9. data/ext/Endpoint.cpp +1 -10
  10. data/ext/Endpoint.h +1 -6
  11. data/ext/ImplicitContext.cpp +1 -6
  12. data/ext/ImplicitContext.h +1 -6
  13. data/ext/Init.cpp +1 -6
  14. data/ext/Logger.cpp +1 -6
  15. data/ext/Logger.h +1 -6
  16. data/ext/Operation.cpp +6 -11
  17. data/ext/Operation.h +1 -6
  18. data/ext/Properties.cpp +3 -8
  19. data/ext/Properties.h +1 -6
  20. data/ext/Proxy.cpp +21 -14
  21. data/ext/Proxy.h +1 -6
  22. data/ext/Slice.cpp +3 -18
  23. data/ext/Slice.h +1 -6
  24. data/ext/Types.cpp +74 -58
  25. data/ext/Types.h +1 -6
  26. data/ext/Util.cpp +61 -32
  27. data/ext/Util.h +108 -33
  28. data/ext/ValueFactoryManager.cpp +1 -6
  29. data/ext/ValueFactoryManager.h +1 -6
  30. data/ext/extconf.rb +5 -3
  31. data/ext/ice/cpp/include/Ice/Application.h +1 -6
  32. data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
  33. data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
  34. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
  35. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
  36. data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
  37. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -6
  38. data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
  39. data/ext/ice/cpp/include/Ice/Config.h +5 -6
  40. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
  41. data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -6
  42. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
  43. data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
  44. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -6
  45. data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
  46. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
  47. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
  48. data/ext/ice/cpp/include/Ice/Exception.h +4 -9
  49. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
  50. data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
  51. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +2 -7
  52. data/ext/ice/cpp/include/Ice/Format.h +1 -6
  53. data/ext/ice/cpp/include/Ice/Functional.h +2 -7
  54. data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
  55. data/ext/ice/cpp/include/Ice/Handle.h +1 -6
  56. data/ext/ice/cpp/include/Ice/Ice.h +1 -6
  57. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +11 -17
  58. data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
  59. data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
  60. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
  61. data/ext/ice/cpp/include/Ice/Initialize.h +13 -7
  62. data/ext/ice/cpp/include/Ice/InputStream.h +6 -11
  63. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
  64. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
  65. data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
  66. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
  67. data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
  68. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
  69. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
  70. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
  71. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
  72. data/ext/ice/cpp/include/Ice/Object.h +6 -6
  73. data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
  74. data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
  75. data/ext/ice/cpp/include/Ice/Optional.h +21 -7
  76. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +18 -8
  77. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
  78. data/ext/ice/cpp/include/Ice/OutputStream.h +6 -11
  79. data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
  80. data/ext/ice/cpp/include/Ice/Proxy.h +50 -23
  81. data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
  82. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
  83. data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
  84. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
  85. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
  86. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
  87. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
  88. data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
  89. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
  90. data/ext/ice/cpp/include/Ice/Service.h +2 -7
  91. data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
  92. data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
  93. data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
  94. data/ext/ice/cpp/include/Ice/StreamHelpers.h +2 -7
  95. data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
  96. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
  97. data/ext/ice/cpp/include/Ice/UUID.h +1 -6
  98. data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
  99. data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
  100. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
  101. data/ext/ice/cpp/include/Ice/Value.h +2 -7
  102. data/ext/ice/cpp/include/Ice/ValueF.h +1 -6
  103. data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
  104. data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
  105. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +1 -6
  106. data/ext/ice/cpp/include/IceSSL/Plugin.h +59 -6
  107. data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
  108. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
  109. data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
  110. data/ext/ice/cpp/include/IceUtil/Atomic.h +2 -7
  111. data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
  112. data/ext/ice/cpp/include/IceUtil/Config.h +34 -20
  113. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +5 -10
  114. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
  115. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +26 -38
  116. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
  117. data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
  118. data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
  119. data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
  120. data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
  121. data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
  122. data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
  123. data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
  124. data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
  125. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
  126. data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -9
  127. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
  128. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +5 -10
  129. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
  130. data/ext/ice/cpp/include/IceUtil/Optional.h +9 -6
  131. data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
  132. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +18 -20
  133. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
  134. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
  135. data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
  136. data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
  137. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
  138. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +8 -7
  139. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
  140. data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
  141. data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
  142. data/ext/ice/cpp/include/IceUtil/StringConverter.h +2 -7
  143. data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
  144. data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
  145. data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
  146. data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
  147. data/ext/ice/cpp/include/IceUtil/Timer.h +1 -6
  148. data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
  149. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
  150. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +12 -17
  151. data/ext/ice/cpp/include/generated/Ice/Communicator.h +35 -34
  152. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +4 -9
  153. data/ext/ice/cpp/include/generated/Ice/Connection.h +92 -57
  154. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +4 -9
  155. data/ext/ice/cpp/include/generated/Ice/Current.h +51 -57
  156. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +73 -42
  157. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +5 -10
  158. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +8 -13
  159. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +5 -10
  160. data/ext/ice/cpp/include/generated/Ice/Identity.h +7 -13
  161. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +28 -27
  162. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +4 -9
  163. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +76 -21
  164. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +4 -9
  165. data/ext/ice/cpp/include/generated/Ice/LocalException.h +597 -272
  166. data/ext/ice/cpp/include/generated/Ice/Locator.h +135 -52
  167. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +8 -13
  168. data/ext/ice/cpp/include/generated/Ice/Logger.h +10 -9
  169. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +4 -9
  170. data/ext/ice/cpp/include/generated/Ice/Metrics.h +175 -134
  171. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +20 -19
  172. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +4 -9
  173. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +16 -15
  174. data/ext/ice/cpp/include/generated/Ice/Plugin.h +18 -11
  175. data/ext/ice/cpp/include/generated/Ice/PluginF.h +4 -9
  176. data/ext/ice/cpp/include/generated/Ice/Process.h +14 -13
  177. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +6 -11
  178. data/ext/ice/cpp/include/generated/Ice/Properties.h +22 -21
  179. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +20 -19
  180. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +6 -11
  181. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +39 -28
  182. data/ext/ice/cpp/include/generated/Ice/Router.h +43 -36
  183. data/ext/ice/cpp/include/generated/Ice/RouterF.h +6 -11
  184. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +38 -37
  185. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +4 -9
  186. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +4 -9
  187. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +22 -15
  188. data/ext/ice/cpp/include/generated/Ice/Version.h +16 -23
  189. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +12 -12
  190. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +4 -9
  191. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +10 -10
  192. data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
  193. data/ext/ice/cpp/src/Ice/ACM.h +1 -6
  194. data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
  195. data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
  196. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
  197. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
  198. data/ext/ice/cpp/src/Ice/ArgVector.cpp +8 -13
  199. data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
  200. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
  201. data/ext/ice/cpp/src/Ice/Base64.cpp +12 -18
  202. data/ext/ice/cpp/src/Ice/Base64.h +1 -6
  203. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +2 -7
  204. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
  205. data/ext/ice/cpp/src/Ice/Buffer.cpp +3 -8
  206. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +4 -9
  207. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
  208. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
  209. data/ext/ice/cpp/src/Ice/Communicator.cpp +4 -9
  210. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +4 -9
  211. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +23 -10
  212. data/ext/ice/cpp/src/Ice/CommunicatorI.h +6 -7
  213. data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
  214. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
  216. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
  217. data/ext/ice/cpp/src/Ice/Connection.cpp +4 -9
  218. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +4 -9
  219. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
  220. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
  221. data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
  222. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +34 -24
  223. data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
  224. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
  225. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
  226. data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
  227. data/ext/ice/cpp/src/Ice/Connector.h +1 -6
  228. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
  229. data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
  230. data/ext/ice/cpp/src/Ice/Current.cpp +4 -9
  231. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -6
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
  233. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
  234. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +14 -6
  235. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +7 -11
  236. data/ext/ice/cpp/src/Ice/Endpoint.cpp +4 -9
  237. data/ext/ice/cpp/src/Ice/EndpointF.cpp +4 -9
  238. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
  239. data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
  240. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -6
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
  243. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
  244. data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -6
  245. data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
  246. data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
  247. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +4 -9
  248. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
  249. data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
  250. data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
  251. data/ext/ice/cpp/src/Ice/Exception.cpp +8 -13
  252. data/ext/ice/cpp/src/Ice/FacetMap.cpp +4 -9
  253. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
  254. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
  255. data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
  256. data/ext/ice/cpp/src/Ice/HashUtil.h +2 -7
  257. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
  258. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
  259. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +14 -31
  260. data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
  261. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
  262. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
  263. data/ext/ice/cpp/src/Ice/Identity.cpp +4 -9
  264. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +4 -9
  265. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +4 -9
  266. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -8
  267. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
  268. data/ext/ice/cpp/src/Ice/Incoming.cpp +11 -13
  269. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
  270. data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
  271. data/ext/ice/cpp/src/Ice/Initialize.cpp +6 -11
  272. data/ext/ice/cpp/src/Ice/InputStream.cpp +55 -87
  273. data/ext/ice/cpp/src/Ice/Instance.cpp +58 -13
  274. data/ext/ice/cpp/src/Ice/Instance.h +3 -6
  275. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +4 -9
  276. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +4 -9
  277. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
  278. data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
  279. data/ext/ice/cpp/src/Ice/LocalException.cpp +400 -9
  280. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
  281. data/ext/ice/cpp/src/Ice/Locator.cpp +52 -27
  282. data/ext/ice/cpp/src/Ice/LocatorF.cpp +4 -9
  283. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
  284. data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
  285. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
  286. data/ext/ice/cpp/src/Ice/Logger.cpp +4 -9
  287. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +8 -19
  288. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
  289. data/ext/ice/cpp/src/Ice/LoggerF.cpp +4 -9
  290. data/ext/ice/cpp/src/Ice/LoggerI.cpp +13 -12
  291. data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
  292. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
  293. data/ext/ice/cpp/src/Ice/Metrics.cpp +12 -11
  294. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
  295. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
  296. data/ext/ice/cpp/src/Ice/Network.cpp +70 -52
  297. data/ext/ice/cpp/src/Ice/Network.h +4 -9
  298. data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
  299. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
  300. data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
  301. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
  302. data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
  303. data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
  304. data/ext/ice/cpp/src/Ice/Object.cpp +10 -14
  305. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +4 -9
  306. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +4 -9
  307. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
  308. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
  309. data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
  310. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +22 -7
  311. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +5 -6
  312. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +4 -9
  313. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
  314. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
  315. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
  316. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +6 -9
  317. data/ext/ice/cpp/src/Ice/OutputStream.cpp +29 -61
  318. data/ext/ice/cpp/src/Ice/Plugin.cpp +4 -9
  319. data/ext/ice/cpp/src/Ice/PluginF.cpp +4 -9
  320. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
  321. data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
  322. data/ext/ice/cpp/src/Ice/Process.cpp +8 -13
  323. data/ext/ice/cpp/src/Ice/ProcessF.cpp +4 -9
  324. data/ext/ice/cpp/src/Ice/Properties.cpp +4 -9
  325. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +11 -16
  326. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
  327. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
  328. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +4 -9
  329. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +13 -17
  330. data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
  331. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +42 -8
  332. data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
  333. data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
  334. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
  335. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
  336. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
  337. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
  338. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
  339. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
  340. data/ext/ice/cpp/src/Ice/Proxy.cpp +9 -8
  341. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +11 -7
  342. data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
  343. data/ext/ice/cpp/src/Ice/Reference.cpp +61 -33
  344. data/ext/ice/cpp/src/Ice/Reference.h +1 -6
  345. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +2 -9
  346. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
  347. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
  348. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +4 -8
  349. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
  350. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +20 -19
  351. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
  352. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
  353. data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
  354. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
  355. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
  356. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
  357. data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
  358. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +7 -9
  359. data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
  360. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
  361. data/ext/ice/cpp/src/Ice/Router.cpp +15 -20
  362. data/ext/ice/cpp/src/Ice/RouterF.cpp +4 -9
  363. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
  364. data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
  365. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
  366. data/ext/ice/cpp/src/Ice/SHA1.cpp +3 -8
  367. data/ext/ice/cpp/src/Ice/Selector.cpp +59 -25
  368. data/ext/ice/cpp/src/Ice/Selector.h +1 -6
  369. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +4 -9
  370. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +4 -9
  371. data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
  372. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
  373. data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
  374. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +4 -9
  375. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
  376. data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
  377. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +15 -18
  378. data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
  379. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -6
  380. data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
  381. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
  382. data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
  383. data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
  384. data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
  385. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +9 -7
  386. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
  387. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -6
  388. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
  389. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +6 -6
  390. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
  391. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +6 -6
  392. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
  393. data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
  394. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +69 -9
  395. data/ext/ice/cpp/src/Ice/ThreadPool.h +11 -12
  396. data/ext/ice/cpp/src/Ice/Timer.cpp +11 -6
  397. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
  398. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
  399. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
  400. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
  401. data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
  402. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
  403. data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
  404. data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
  405. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
  406. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
  407. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +12 -7
  408. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
  409. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +33 -26
  410. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
  411. data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
  412. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +4 -9
  413. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
  414. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
  415. data/ext/ice/cpp/src/Ice/Version.cpp +4 -9
  416. data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
  417. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
  418. data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
  419. data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
  420. data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
  421. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -6
  422. data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
  423. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +18 -22
  424. data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
  425. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +4 -9
  426. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +497 -17
  427. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
  428. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
  429. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
  430. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
  431. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
  432. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
  433. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +4 -9
  434. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +22 -15
  435. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
  436. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +52 -17
  437. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
  438. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
  439. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +4 -9
  440. data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
  441. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +4 -9
  442. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +4 -9
  443. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
  444. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
  445. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
  446. data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
  447. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +4 -9
  448. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
  449. data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
  450. data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
  451. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +15 -20
  452. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +100 -46
  453. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -8
  454. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
  455. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
  456. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +271 -147
  457. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +3 -11
  458. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
  459. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
  460. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +115 -6
  461. data/ext/ice/cpp/src/IceSSL/PluginI.h +11 -6
  462. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
  463. data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
  464. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
  465. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -36
  466. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -8
  467. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
  468. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
  469. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +154 -38
  470. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +8 -6
  471. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +21 -14
  472. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +3 -6
  473. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
  474. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +37 -31
  475. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
  476. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
  477. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
  478. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
  479. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +160 -99
  480. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +7 -7
  481. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +35 -25
  482. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
  483. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
  484. data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
  485. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
  486. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
  487. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
  488. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
  489. data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
  490. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
  491. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
  492. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
  493. data/ext/ice/cpp/src/IceSSL/Util.cpp +12 -11
  494. data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
  495. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
  496. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
  497. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
  498. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
  499. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +2 -7
  500. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
  501. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
  502. data/ext/ice/cpp/src/IceUtil/Options.cpp +25 -15
  503. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +41 -16
  504. data/ext/ice/cpp/src/IceUtil/Random.cpp +3 -8
  505. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -7
  506. data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
  507. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -11
  508. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +45 -12
  509. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
  510. data/ext/ice/cpp/src/IceUtil/Time.cpp +12 -19
  511. data/ext/ice/cpp/src/IceUtil/UUID.cpp +6 -11
  512. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
  513. data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
  514. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +17 -16
  515. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +75 -73
  516. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +3 -8
  517. data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
  518. data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
  519. data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
  520. data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
  521. data/ext/ice/cpp/src/Slice/Grammar.cpp +249 -245
  522. data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
  523. data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
  524. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +89 -92
  525. data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
  526. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
  527. data/ext/ice/cpp/src/Slice/MD5.h +1 -6
  528. data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -0
  529. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +10 -6
  530. data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
  531. data/ext/ice/cpp/src/Slice/Parser.cpp +153 -166
  532. data/ext/ice/cpp/src/Slice/Parser.h +33 -10
  533. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +25 -17
  534. data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -7
  535. data/ext/ice/cpp/src/Slice/Python.cpp +22 -28
  536. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +80 -49
  537. data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
  538. data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
  539. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +13 -15
  540. data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
  541. data/ext/ice/cpp/src/Slice/Scanner.cpp +689 -437
  542. data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
  543. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +12 -12
  544. data/ext/ice/cpp/src/Slice/Util.h +1 -6
  545. data/ext/ice/mcpp/CMakeLists.txt +80 -0
  546. data/ext/ice/mcpp/Makefile +2 -5
  547. data/ext/ice/mcpp/expand.c +6 -6
  548. data/ice.gemspec +2 -4
  549. data/lib/Glacier2.rb +1 -6
  550. data/lib/Glacier2/Metrics.rb +3 -8
  551. data/lib/Glacier2/PermissionsVerifier.rb +3 -8
  552. data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
  553. data/lib/Glacier2/Router.rb +3 -8
  554. data/lib/Glacier2/RouterF.rb +3 -8
  555. data/lib/Glacier2/SSLInfo.rb +3 -8
  556. data/lib/Glacier2/Session.rb +3 -8
  557. data/lib/Ice.rb +1 -6
  558. data/lib/Ice/BuiltinSequences.rb +3 -8
  559. data/lib/Ice/Communicator.rb +3 -8
  560. data/lib/Ice/CommunicatorF.rb +3 -8
  561. data/lib/Ice/Connection.rb +3 -8
  562. data/lib/Ice/ConnectionF.rb +3 -8
  563. data/lib/Ice/Current.rb +3 -8
  564. data/lib/Ice/Endpoint.rb +3 -8
  565. data/lib/Ice/EndpointF.rb +3 -8
  566. data/lib/Ice/EndpointTypes.rb +3 -8
  567. data/lib/Ice/FacetMap.rb +3 -8
  568. data/lib/Ice/Identity.rb +3 -8
  569. data/lib/Ice/ImplicitContext.rb +3 -8
  570. data/lib/Ice/ImplicitContextF.rb +3 -8
  571. data/lib/Ice/Instrumentation.rb +3 -8
  572. data/lib/Ice/InstrumentationF.rb +3 -8
  573. data/lib/Ice/LocalException.rb +3 -8
  574. data/lib/Ice/Locator.rb +3 -8
  575. data/lib/Ice/LocatorF.rb +3 -8
  576. data/lib/Ice/Logger.rb +3 -8
  577. data/lib/Ice/LoggerF.rb +3 -8
  578. data/lib/Ice/Metrics.rb +3 -8
  579. data/lib/Ice/ObjectAdapter.rb +3 -8
  580. data/lib/Ice/ObjectAdapterF.rb +3 -8
  581. data/lib/Ice/ObjectFactory.rb +3 -8
  582. data/lib/Ice/Plugin.rb +3 -8
  583. data/lib/Ice/PluginF.rb +3 -8
  584. data/lib/Ice/Process.rb +3 -8
  585. data/lib/Ice/ProcessF.rb +3 -8
  586. data/lib/Ice/Properties.rb +3 -8
  587. data/lib/Ice/PropertiesAdmin.rb +3 -8
  588. data/lib/Ice/PropertiesF.rb +3 -8
  589. data/lib/Ice/RemoteLogger.rb +3 -8
  590. data/lib/Ice/Router.rb +3 -8
  591. data/lib/Ice/RouterF.rb +3 -8
  592. data/lib/Ice/ServantLocator.rb +3 -8
  593. data/lib/Ice/ServantLocatorF.rb +3 -8
  594. data/lib/Ice/SliceChecksumDict.rb +3 -8
  595. data/lib/Ice/ValueFactory.rb +3 -8
  596. data/lib/Ice/Version.rb +3 -8
  597. data/lib/IceBox.rb +1 -6
  598. data/lib/IceBox/IceBox.rb +3 -8
  599. data/lib/IceGrid.rb +1 -6
  600. data/lib/IceGrid/Admin.rb +3 -8
  601. data/lib/IceGrid/Descriptor.rb +3 -8
  602. data/lib/IceGrid/Exception.rb +3 -8
  603. data/lib/IceGrid/FileParser.rb +3 -8
  604. data/lib/IceGrid/PluginFacade.rb +3 -8
  605. data/lib/IceGrid/Registry.rb +3 -8
  606. data/lib/IceGrid/Session.rb +3 -8
  607. data/lib/IceGrid/UserAccountMapper.rb +3 -8
  608. data/lib/IcePatch2.rb +1 -6
  609. data/lib/IcePatch2/FileInfo.rb +3 -8
  610. data/lib/IcePatch2/FileServer.rb +3 -8
  611. data/lib/IceStorm.rb +1 -6
  612. data/lib/IceStorm/IceStorm.rb +3 -8
  613. data/lib/IceStorm/Metrics.rb +3 -8
  614. data/slice/Glacier2/Metrics.ice +14 -8
  615. data/slice/Glacier2/PermissionsVerifier.ice +11 -7
  616. data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
  617. data/slice/Glacier2/Router.ice +12 -8
  618. data/slice/Glacier2/RouterF.ice +11 -7
  619. data/slice/Glacier2/SSLInfo.ice +11 -7
  620. data/slice/Glacier2/Session.ice +11 -7
  621. data/slice/Ice/BuiltinSequences.ice +13 -7
  622. data/slice/Ice/Communicator.ice +92 -44
  623. data/slice/Ice/CommunicatorF.ice +13 -7
  624. data/slice/Ice/Connection.ice +35 -29
  625. data/slice/Ice/ConnectionF.ice +13 -7
  626. data/slice/Ice/Current.ice +29 -23
  627. data/slice/Ice/Endpoint.ice +22 -19
  628. data/slice/Ice/EndpointF.ice +14 -8
  629. data/slice/Ice/EndpointTypes.ice +15 -9
  630. data/slice/Ice/FacetMap.ice +14 -8
  631. data/slice/Ice/Identity.ice +13 -7
  632. data/slice/Ice/ImplicitContext.ice +28 -22
  633. data/slice/Ice/ImplicitContextF.ice +12 -7
  634. data/slice/Ice/Instrumentation.ice +19 -13
  635. data/slice/Ice/InstrumentationF.ice +13 -7
  636. data/slice/Ice/LocalException.ice +35 -29
  637. data/slice/Ice/Locator.ice +13 -7
  638. data/slice/Ice/LocatorF.ice +13 -7
  639. data/slice/Ice/Logger.ice +19 -13
  640. data/slice/Ice/LoggerF.ice +13 -7
  641. data/slice/Ice/Metrics.ice +26 -18
  642. data/slice/Ice/ObjectAdapter.ice +63 -45
  643. data/slice/Ice/ObjectAdapterF.ice +13 -7
  644. data/slice/Ice/ObjectFactory.ice +20 -12
  645. data/slice/Ice/Plugin.ice +19 -10
  646. data/slice/Ice/PluginF.ice +17 -7
  647. data/slice/Ice/Process.ice +13 -7
  648. data/slice/Ice/ProcessF.ice +13 -7
  649. data/slice/Ice/Properties.ice +35 -24
  650. data/slice/Ice/PropertiesAdmin.ice +13 -7
  651. data/slice/Ice/PropertiesF.ice +13 -7
  652. data/slice/Ice/RemoteLogger.ice +13 -7
  653. data/slice/Ice/Router.ice +14 -8
  654. data/slice/Ice/RouterF.ice +13 -7
  655. data/slice/Ice/ServantLocator.ice +31 -23
  656. data/slice/Ice/ServantLocatorF.ice +13 -7
  657. data/slice/Ice/SliceChecksumDict.ice +13 -7
  658. data/slice/Ice/ValueFactory.ice +22 -15
  659. data/slice/Ice/Version.ice +13 -7
  660. data/slice/IceBT/ConnectionInfo.ice +12 -7
  661. data/slice/IceBT/EndpointInfo.ice +13 -8
  662. data/slice/IceBT/Types.ice +12 -7
  663. data/slice/IceBox/IceBox.ice +29 -9
  664. data/slice/IceDiscovery/IceDiscovery.ice +68 -7
  665. data/slice/IceGrid/Admin.ice +41 -35
  666. data/slice/IceGrid/Descriptor.ice +15 -10
  667. data/slice/IceGrid/Exception.ice +15 -10
  668. data/slice/IceGrid/FileParser.ice +14 -8
  669. data/slice/IceGrid/PluginFacade.ice +17 -11
  670. data/slice/IceGrid/Registry.ice +13 -7
  671. data/slice/IceGrid/Session.ice +18 -12
  672. data/slice/IceGrid/UserAccountMapper.ice +16 -10
  673. data/slice/IceIAP/ConnectionInfo.ice +11 -8
  674. data/slice/IceIAP/EndpointInfo.ice +11 -8
  675. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
  676. data/slice/IcePatch2/FileInfo.ice +12 -7
  677. data/slice/IcePatch2/FileServer.ice +13 -8
  678. data/slice/IceSSL/ConnectionInfo.ice +16 -9
  679. data/slice/IceSSL/ConnectionInfoF.ice +14 -8
  680. data/slice/IceSSL/EndpointInfo.ice +14 -8
  681. data/slice/IceStorm/IceStorm.ice +17 -11
  682. data/slice/IceStorm/Metrics.ice +12 -8
  683. metadata +8 -4
@@ -1,13 +1,8 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
4
  //
8
- // **********************************************************************
9
- //
10
- // Ice version 3.7.1
5
+ // Ice version 3.7.6
11
6
  //
12
7
  // <auto-generated>
13
8
  //
@@ -41,10 +36,10 @@
41
36
  # if ICE_INT_VERSION / 100 != 307
42
37
  # error Ice version mismatch!
43
38
  # endif
44
- # if ICE_INT_VERSION % 100 > 50
39
+ # if ICE_INT_VERSION % 100 >= 50
45
40
  # error Beta header file detected
46
41
  # endif
47
- # if ICE_INT_VERSION % 100 < 1
42
+ # if ICE_INT_VERSION % 100 < 6
48
43
  # error Ice patch level mismatch!
49
44
  # endif
50
45
  #endif
@@ -65,9 +60,9 @@ namespace Ice
65
60
  {
66
61
 
67
62
  /**
68
- * A request context. <tt>Context</tt> is used to transmit metadata about a
63
+ * A request context. <code>Context</code> is used to transmit metadata about a
69
64
  * request from the server to the client, such as Quality-of-Service
70
- * (QoS) parameters. Each operation on the client has a <tt>Context</tt> as
65
+ * (QoS) parameters. Each operation on the client has a <code>Context</code> as
71
66
  * its implicit final parameter.
72
67
  */
73
68
  using Context = ::std::map<::std::string, ::std::string>;
@@ -78,35 +73,35 @@ using Context = ::std::map<::std::string, ::std::string>;
78
73
  enum class OperationMode : unsigned char
79
74
  {
80
75
  /**
81
- * Ordinary operations have <tt>Normal</tt> mode. These operations
76
+ * Ordinary operations have <code>Normal</code> mode. These operations
82
77
  * modify object state; invoking such an operation twice in a row
83
78
  * has different semantics than invoking it once. The Ice run time
84
79
  * guarantees that it will not violate at-most-once semantics for
85
- * <tt>Normal</tt> operations.
80
+ * <code>Normal</code> operations.
86
81
  */
87
82
  Normal,
88
83
  /**
89
- * Operations that use the Slice <tt>nonmutating</tt> keyword must not
84
+ * Operations that use the Slice <code>nonmutating</code> keyword must not
90
85
  * modify object state. For C++, nonmutating operations generate
91
- * <tt>const</tt> member functions in the skeleton. In addition, the Ice
86
+ * <code>const</code> member functions in the skeleton. In addition, the Ice
92
87
  * run time will attempt to transparently recover from certain
93
88
  * run-time errors by re-issuing a failed request and propagate
94
89
  * the failure to the application only if the second attempt
95
90
  * fails.
96
91
  *
97
- * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
98
- * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
99
- * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
100
- * member functions, use the <tt>\["cpp:const"]</tt> metadata
92
+ * <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
93
+ * <code>idempotent</code> keyword instead. For C++, to retain the mapping
94
+ * of <code>nonmutating</code> operations to C++ <code>const</code>
95
+ * member functions, use the <code>\["cpp:const"]</code> metadata
101
96
  * directive.
102
97
  */
103
98
  Nonmutating,
104
99
  /**
105
- * Operations that use the Slice <tt>idempotent</tt> keyword can modify
100
+ * Operations that use the Slice <code>idempotent</code> keyword can modify
106
101
  * object state, but invoking an operation twice in a row must
107
102
  * result in the same object state as invoking it once. For
108
- * example, <tt>x = 1</tt> is an idempotent statement,
109
- * whereas <tt>x += 1</tt> is not. For idempotent
103
+ * example, <code>x = 1</code> is an idempotent statement,
104
+ * whereas <code>x += 1</code> is not. For idempotent
110
105
  * operations, the Ice run-time uses the same retry behavior
111
106
  * as for nonmutating operations in case of a potentially
112
107
  * recoverable error.
@@ -116,8 +111,8 @@ enum class OperationMode : unsigned char
116
111
 
117
112
  /**
118
113
  * Information about the current method invocation for servers. Each
119
- * operation on the server has a <tt>Current</tt> as its implicit final
120
- * parameter. <tt>Current</tt> is mostly used for Ice services. Most
114
+ * operation on the server has a <code>Current</code> as its implicit final
115
+ * parameter. <code>Current</code> is mostly used for Ice services. Most
121
116
  * applications ignore this parameter.
122
117
  * \headerfile Ice/Ice.h
123
118
  */
@@ -126,17 +121,17 @@ struct Current
126
121
  /**
127
122
  * The object adapter.
128
123
  */
129
- ::std::shared_ptr<ObjectAdapter> adapter;
124
+ ::std::shared_ptr<::Ice::ObjectAdapter> adapter;
130
125
  /**
131
126
  * Information about the connection over which the current method
132
127
  * invocation was received. If the invocation is direct due to
133
128
  * collocation optimization, this value is set to null.
134
129
  */
135
- ::std::shared_ptr<Connection> con;
130
+ ::std::shared_ptr<::Ice::Connection> con;
136
131
  /**
137
132
  * The Ice object identity.
138
133
  */
139
- Identity id;
134
+ ::Ice::Identity id;
140
135
  /**
141
136
  * The facet.
142
137
  */
@@ -148,26 +143,25 @@ struct Current
148
143
  /**
149
144
  * The mode of the operation.
150
145
  */
151
- OperationMode mode;
146
+ ::Ice::OperationMode mode;
152
147
  /**
153
148
  * The request context, as received from the client.
154
149
  */
155
- Context ctx;
150
+ ::Ice::Context ctx;
156
151
  /**
157
- * The request id unless oneway (0) or collocated (-1).
152
+ * The request id unless oneway (0).
158
153
  */
159
154
  int requestId;
160
155
  /**
161
156
  * The encoding version used to encode the input and output parameters.
162
157
  */
163
- EncodingVersion encoding;
158
+ ::Ice::EncodingVersion encoding;
164
159
 
165
160
  /**
166
- * Obtains a tuple containing all of the exception's data members.
161
+ * Obtains a tuple containing all of the struct's data members.
167
162
  * @return The data members in a tuple.
168
163
  */
169
-
170
- std::tuple<const ::std::shared_ptr<ObjectAdapter>&, const ::std::shared_ptr<Connection>&, const Identity&, const ::std::string&, const ::std::string&, const OperationMode&, const Context&, const int&, const EncodingVersion&> ice_tuple() const
164
+ std::tuple<const ::std::shared_ptr<::Ice::ObjectAdapter>&, const ::std::shared_ptr<::Ice::Connection>&, const ::Ice::Identity&, const ::std::string&, const ::std::string&, const ::Ice::OperationMode&, const ::Ice::Context&, const int&, const ::Ice::EncodingVersion&> ice_tuple() const
171
165
  {
172
166
  return std::tie(adapter, con, id, facet, operation, mode, ctx, requestId, encoding);
173
167
  }
@@ -205,9 +199,9 @@ namespace Ice
205
199
  {
206
200
 
207
201
  /**
208
- * A request context. <tt>Context</tt> is used to transmit metadata about a
202
+ * A request context. <code>Context</code> is used to transmit metadata about a
209
203
  * request from the server to the client, such as Quality-of-Service
210
- * (QoS) parameters. Each operation on the client has a <tt>Context</tt> as
204
+ * (QoS) parameters. Each operation on the client has a <code>Context</code> as
211
205
  * its implicit final parameter.
212
206
  */
213
207
  typedef ::std::map< ::std::string, ::std::string> Context;
@@ -218,35 +212,35 @@ typedef ::std::map< ::std::string, ::std::string> Context;
218
212
  enum OperationMode
219
213
  {
220
214
  /**
221
- * Ordinary operations have <tt>Normal</tt> mode. These operations
215
+ * Ordinary operations have <code>Normal</code> mode. These operations
222
216
  * modify object state; invoking such an operation twice in a row
223
217
  * has different semantics than invoking it once. The Ice run time
224
218
  * guarantees that it will not violate at-most-once semantics for
225
- * <tt>Normal</tt> operations.
219
+ * <code>Normal</code> operations.
226
220
  */
227
221
  Normal,
228
222
  /**
229
- * Operations that use the Slice <tt>nonmutating</tt> keyword must not
223
+ * Operations that use the Slice <code>nonmutating</code> keyword must not
230
224
  * modify object state. For C++, nonmutating operations generate
231
- * <tt>const</tt> member functions in the skeleton. In addition, the Ice
225
+ * <code>const</code> member functions in the skeleton. In addition, the Ice
232
226
  * run time will attempt to transparently recover from certain
233
227
  * run-time errors by re-issuing a failed request and propagate
234
228
  * the failure to the application only if the second attempt
235
229
  * fails.
236
230
  *
237
- * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
238
- * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
239
- * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
240
- * member functions, use the <tt>\["cpp:const"]</tt> metadata
231
+ * <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
232
+ * <code>idempotent</code> keyword instead. For C++, to retain the mapping
233
+ * of <code>nonmutating</code> operations to C++ <code>const</code>
234
+ * member functions, use the <code>\["cpp:const"]</code> metadata
241
235
  * directive.
242
236
  */
243
237
  Nonmutating,
244
238
  /**
245
- * Operations that use the Slice <tt>idempotent</tt> keyword can modify
239
+ * Operations that use the Slice <code>idempotent</code> keyword can modify
246
240
  * object state, but invoking an operation twice in a row must
247
241
  * result in the same object state as invoking it once. For
248
- * example, <tt>x = 1</tt> is an idempotent statement,
249
- * whereas <tt>x += 1</tt> is not. For idempotent
242
+ * example, <code>x = 1</code> is an idempotent statement,
243
+ * whereas <code>x += 1</code> is not. For idempotent
250
244
  * operations, the Ice run-time uses the same retry behavior
251
245
  * as for nonmutating operations in case of a potentially
252
246
  * recoverable error.
@@ -256,8 +250,8 @@ enum OperationMode
256
250
 
257
251
  /**
258
252
  * Information about the current method invocation for servers. Each
259
- * operation on the server has a <tt>Current</tt> as its implicit final
260
- * parameter. <tt>Current</tt> is mostly used for Ice services. Most
253
+ * operation on the server has a <code>Current</code> as its implicit final
254
+ * parameter. <code>Current</code> is mostly used for Ice services. Most
261
255
  * applications ignore this parameter.
262
256
  * \headerfile Ice/Ice.h
263
257
  */
@@ -266,17 +260,17 @@ struct Current
266
260
  /**
267
261
  * The object adapter.
268
262
  */
269
- ObjectAdapterPtr adapter;
263
+ ::Ice::ObjectAdapterPtr adapter;
270
264
  /**
271
265
  * Information about the connection over which the current method
272
266
  * invocation was received. If the invocation is direct due to
273
267
  * collocation optimization, this value is set to null.
274
268
  */
275
- ConnectionPtr con;
269
+ ::Ice::ConnectionPtr con;
276
270
  /**
277
271
  * The Ice object identity.
278
272
  */
279
- Identity id;
273
+ ::Ice::Identity id;
280
274
  /**
281
275
  * The facet.
282
276
  */
@@ -288,19 +282,19 @@ struct Current
288
282
  /**
289
283
  * The mode of the operation.
290
284
  */
291
- OperationMode mode;
285
+ ::Ice::OperationMode mode;
292
286
  /**
293
287
  * The request context, as received from the client.
294
288
  */
295
- Context ctx;
289
+ ::Ice::Context ctx;
296
290
  /**
297
- * The request id unless oneway (0) or collocated (-1).
291
+ * The request id unless oneway (0).
298
292
  */
299
- Int requestId;
293
+ ::Ice::Int requestId;
300
294
  /**
301
295
  * The encoding version used to encode the input and output parameters.
302
296
  */
303
- EncodingVersion encoding;
297
+ ::Ice::EncodingVersion encoding;
304
298
  };
305
299
 
306
300
  }
@@ -1,13 +1,8 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
4
3
  //
5
- // This copy of Ice is licensed to you under the terms described in the
6
- // ICE_LICENSE file included in this distribution.
7
4
  //
8
- // **********************************************************************
9
- //
10
- // Ice version 3.7.1
5
+ // Ice version 3.7.6
11
6
  //
12
7
  // <auto-generated>
13
8
  //
@@ -40,10 +35,10 @@
40
35
  # if ICE_INT_VERSION / 100 != 307
41
36
  # error Ice version mismatch!
42
37
  # endif
43
- # if ICE_INT_VERSION % 100 > 50
38
+ # if ICE_INT_VERSION % 100 >= 50
44
39
  # error Beta header file detected
45
40
  # endif
46
- # if ICE_INT_VERSION % 100 < 1
41
+ # if ICE_INT_VERSION % 100 < 6
47
42
  # error Ice patch level mismatch!
48
43
  # endif
49
44
  #endif
@@ -149,8 +144,8 @@ public:
149
144
  * @param timeout The timeout for the endpoint in milliseconds.
150
145
  * @param compress Specifies whether or not compression should be used if available when using this endpoint.
151
146
  */
152
- EndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress) :
153
- underlying(::std::move(underlying)),
147
+ EndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress) :
148
+ underlying(underlying),
154
149
  timeout(timeout),
155
150
  compress(compress)
156
151
  {
@@ -178,7 +173,7 @@ public:
178
173
  * The information of the underyling endpoint of null if there's
179
174
  * no underlying endpoint.
180
175
  */
181
- ::std::shared_ptr<EndpointInfo> underlying;
176
+ ::std::shared_ptr<::Ice::EndpointInfo> underlying;
182
177
  /**
183
178
  * The timeout for the endpoint in milliseconds. 0 means
184
179
  * non-blocking, -1 means no timeout.
@@ -244,11 +239,11 @@ public:
244
239
  * @param port The port number.
245
240
  * @param sourceAddress The source IP address.
246
241
  */
247
- IPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
248
- EndpointInfo(::std::move(underlying), timeout, compress),
249
- host(::std::move(host)),
242
+ IPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
243
+ EndpointInfo(underlying, timeout, compress),
244
+ host(host),
250
245
  port(port),
251
- sourceAddress(::std::move(sourceAddress))
246
+ sourceAddress(sourceAddress)
252
247
  {
253
248
  }
254
249
 
@@ -293,8 +288,8 @@ public:
293
288
  * @param port The port number.
294
289
  * @param sourceAddress The source IP address.
295
290
  */
296
- TCPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
297
- IPEndpointInfo(::std::move(underlying), timeout, compress, ::std::move(host), port, ::std::move(sourceAddress))
291
+ TCPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
292
+ IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
298
293
  {
299
294
  }
300
295
  };
@@ -328,9 +323,9 @@ public:
328
323
  * @param mcastInterface The multicast interface.
329
324
  * @param mcastTtl The multicast time-to-live (or hops).
330
325
  */
331
- UDPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, int mcastTtl) :
332
- IPEndpointInfo(::std::move(underlying), timeout, compress, ::std::move(host), port, ::std::move(sourceAddress)),
333
- mcastInterface(::std::move(mcastInterface)),
326
+ UDPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, int mcastTtl) :
327
+ IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress),
328
+ mcastInterface(mcastInterface),
334
329
  mcastTtl(mcastTtl)
335
330
  {
336
331
  }
@@ -369,9 +364,9 @@ public:
369
364
  * @param compress Specifies whether or not compression should be used if available when using this endpoint.
370
365
  * @param resource The URI configured with the endpoint.
371
366
  */
372
- WSEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& resource) :
373
- EndpointInfo(::std::move(underlying), timeout, compress),
374
- resource(::std::move(resource))
367
+ WSEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& resource) :
368
+ EndpointInfo(underlying, timeout, compress),
369
+ resource(resource)
375
370
  {
376
371
  }
377
372
 
@@ -407,10 +402,10 @@ public:
407
402
  * @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
408
403
  * @param rawBytes The raw encoding of the opaque endpoint.
409
404
  */
410
- OpaqueEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const EncodingVersion& rawEncoding, const ByteSeq& rawBytes) :
411
- EndpointInfo(::std::move(underlying), timeout, compress),
412
- rawEncoding(::std::move(rawEncoding)),
413
- rawBytes(::std::move(rawBytes))
405
+ OpaqueEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) :
406
+ EndpointInfo(underlying, timeout, compress),
407
+ rawEncoding(rawEncoding),
408
+ rawBytes(rawBytes)
414
409
  {
415
410
  }
416
411
 
@@ -418,11 +413,11 @@ public:
418
413
  * The encoding version of the opaque endpoint (to decode or
419
414
  * encode the rawBytes).
420
415
  */
421
- EncodingVersion rawEncoding;
416
+ ::Ice::EncodingVersion rawEncoding;
422
417
  /**
423
418
  * The raw encoding of the opaque endpoint.
424
419
  */
425
- ByteSeq rawBytes;
420
+ ::Ice::ByteSeq rawBytes;
426
421
  };
427
422
 
428
423
  }
@@ -579,13 +574,18 @@ public:
579
574
  * @param timeout The timeout for the endpoint in milliseconds.
580
575
  * @param compress Specifies whether or not compression should be used if available when using this endpoint.
581
576
  */
582
- EndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress) :
577
+ EndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress) :
583
578
  underlying(underlying),
584
579
  timeout(timeout),
585
580
  compress(compress)
586
581
  {
587
582
  }
588
583
 
584
+ #ifdef ICE_CPP11_COMPILER
585
+ EndpointInfo(const EndpointInfo&) = default;
586
+ EndpointInfo& operator=(const EndpointInfo&) = default;
587
+ #endif
588
+
589
589
  /**
590
590
  * Returns the type of the endpoint.
591
591
  * @return The endpoint type.
@@ -608,12 +608,12 @@ public:
608
608
  * The information of the underyling endpoint of null if there's
609
609
  * no underlying endpoint.
610
610
  */
611
- EndpointInfoPtr underlying;
611
+ ::Ice::EndpointInfoPtr underlying;
612
612
  /**
613
613
  * The timeout for the endpoint in milliseconds. 0 means
614
614
  * non-blocking, -1 means no timeout.
615
615
  */
616
- Int timeout;
616
+ ::Ice::Int timeout;
617
617
  /**
618
618
  * Specifies whether or not compression should be used if
619
619
  * available when using this endpoint.
@@ -645,6 +645,12 @@ public:
645
645
 
646
646
  virtual ~Endpoint();
647
647
 
648
+ #ifdef ICE_CPP11_COMPILER
649
+ Endpoint() = default;
650
+ Endpoint(const Endpoint&) = default;
651
+ Endpoint& operator=(const Endpoint&) = default;
652
+ #endif
653
+
648
654
  /**
649
655
  * Return a string representation of the endpoint.
650
656
  * @return The string representation of the endpoint.
@@ -696,7 +702,7 @@ public:
696
702
  * @param port The port number.
697
703
  * @param sourceAddress The source IP address.
698
704
  */
699
- IPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress) :
705
+ IPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) :
700
706
  ::Ice::EndpointInfo(underlying, timeout, compress),
701
707
  host(host),
702
708
  port(port),
@@ -704,6 +710,11 @@ public:
704
710
  {
705
711
  }
706
712
 
713
+ #ifdef ICE_CPP11_COMPILER
714
+ IPEndpointInfo(const IPEndpointInfo&) = default;
715
+ IPEndpointInfo& operator=(const IPEndpointInfo&) = default;
716
+ #endif
717
+
707
718
  /**
708
719
  * The host or address configured with the endpoint.
709
720
  */
@@ -711,7 +722,7 @@ public:
711
722
  /**
712
723
  * The port number.
713
724
  */
714
- Int port;
725
+ ::Ice::Int port;
715
726
  /**
716
727
  * The source IP address.
717
728
  */
@@ -756,10 +767,15 @@ public:
756
767
  * @param port The port number.
757
768
  * @param sourceAddress The source IP address.
758
769
  */
759
- TCPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress) :
770
+ TCPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) :
760
771
  ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
761
772
  {
762
773
  }
774
+
775
+ #ifdef ICE_CPP11_COMPILER
776
+ TCPEndpointInfo(const TCPEndpointInfo&) = default;
777
+ TCPEndpointInfo& operator=(const TCPEndpointInfo&) = default;
778
+ #endif
763
779
  };
764
780
 
765
781
  /// \cond INTERNAL
@@ -802,13 +818,18 @@ public:
802
818
  * @param mcastInterface The multicast interface.
803
819
  * @param mcastTtl The multicast time-to-live (or hops).
804
820
  */
805
- UDPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, Int mcastTtl) :
821
+ UDPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, ::Ice::Int mcastTtl) :
806
822
  ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress),
807
823
  mcastInterface(mcastInterface),
808
824
  mcastTtl(mcastTtl)
809
825
  {
810
826
  }
811
827
 
828
+ #ifdef ICE_CPP11_COMPILER
829
+ UDPEndpointInfo(const UDPEndpointInfo&) = default;
830
+ UDPEndpointInfo& operator=(const UDPEndpointInfo&) = default;
831
+ #endif
832
+
812
833
  /**
813
834
  * The multicast interface.
814
835
  */
@@ -816,7 +837,7 @@ public:
816
837
  /**
817
838
  * The multicast time-to-live (or hops).
818
839
  */
819
- Int mcastTtl;
840
+ ::Ice::Int mcastTtl;
820
841
  };
821
842
 
822
843
  /// \cond INTERNAL
@@ -854,12 +875,17 @@ public:
854
875
  * @param compress Specifies whether or not compression should be used if available when using this endpoint.
855
876
  * @param resource The URI configured with the endpoint.
856
877
  */
857
- WSEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& resource) :
878
+ WSEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& resource) :
858
879
  ::Ice::EndpointInfo(underlying, timeout, compress),
859
880
  resource(resource)
860
881
  {
861
882
  }
862
883
 
884
+ #ifdef ICE_CPP11_COMPILER
885
+ WSEndpointInfo(const WSEndpointInfo&) = default;
886
+ WSEndpointInfo& operator=(const WSEndpointInfo&) = default;
887
+ #endif
888
+
863
889
  /**
864
890
  * The URI configured with the endpoint.
865
891
  */
@@ -903,22 +929,27 @@ public:
903
929
  * @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
904
930
  * @param rawBytes The raw encoding of the opaque endpoint.
905
931
  */
906
- OpaqueEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const EncodingVersion& rawEncoding, const ByteSeq& rawBytes) :
932
+ OpaqueEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) :
907
933
  ::Ice::EndpointInfo(underlying, timeout, compress),
908
934
  rawEncoding(rawEncoding),
909
935
  rawBytes(rawBytes)
910
936
  {
911
937
  }
912
938
 
939
+ #ifdef ICE_CPP11_COMPILER
940
+ OpaqueEndpointInfo(const OpaqueEndpointInfo&) = default;
941
+ OpaqueEndpointInfo& operator=(const OpaqueEndpointInfo&) = default;
942
+ #endif
943
+
913
944
  /**
914
945
  * The encoding version of the opaque endpoint (to decode or
915
946
  * encode the rawBytes).
916
947
  */
917
- EncodingVersion rawEncoding;
948
+ ::Ice::EncodingVersion rawEncoding;
918
949
  /**
919
950
  * The raw encoding of the opaque endpoint.
920
951
  */
921
- ByteSeq rawBytes;
952
+ ::Ice::ByteSeq rawBytes;
922
953
  };
923
954
 
924
955
  /// \cond INTERNAL