zeroc-ice 3.6.0 → 3.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (195) hide show
  1. checksums.yaml +4 -4
  2. data/ext/ice/cpp/include/Ice/BuiltinSequences.h +2 -2
  3. data/ext/ice/cpp/include/Ice/Communicator.h +2 -2
  4. data/ext/ice/cpp/include/Ice/CommunicatorF.h +2 -2
  5. data/ext/ice/cpp/include/Ice/Connection.h +5 -9
  6. data/ext/ice/cpp/include/Ice/ConnectionF.h +2 -2
  7. data/ext/ice/cpp/include/Ice/Current.h +2 -2
  8. data/ext/ice/cpp/include/Ice/Endpoint.h +6 -11
  9. data/ext/ice/cpp/include/Ice/EndpointF.h +2 -2
  10. data/ext/ice/cpp/include/Ice/EndpointTypes.h +2 -2
  11. data/ext/ice/cpp/include/Ice/FacetMap.h +2 -2
  12. data/ext/ice/cpp/include/Ice/Ice.h +1 -0
  13. data/ext/ice/cpp/include/Ice/Identity.h +2 -2
  14. data/ext/ice/cpp/include/Ice/ImplicitContext.h +2 -2
  15. data/ext/ice/cpp/include/Ice/ImplicitContextF.h +2 -2
  16. data/ext/ice/cpp/include/Ice/Instrumentation.h +2 -2
  17. data/ext/ice/cpp/include/Ice/InstrumentationF.h +2 -2
  18. data/ext/ice/cpp/include/Ice/LocalException.h +2 -2
  19. data/ext/ice/cpp/include/Ice/Locator.h +2 -2
  20. data/ext/ice/cpp/include/Ice/LocatorF.h +2 -2
  21. data/ext/ice/cpp/include/Ice/Logger.h +2 -2
  22. data/ext/ice/cpp/include/Ice/LoggerF.h +2 -2
  23. data/ext/ice/cpp/include/Ice/Metrics.h +7 -14
  24. data/ext/ice/cpp/include/Ice/ObjectAdapter.h +2 -2
  25. data/ext/ice/cpp/include/Ice/ObjectAdapterF.h +2 -2
  26. data/ext/ice/cpp/include/Ice/ObjectFactory.h +2 -2
  27. data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +2 -2
  28. data/ext/ice/cpp/include/Ice/Plugin.h +2 -2
  29. data/ext/ice/cpp/include/Ice/PluginF.h +2 -2
  30. data/ext/ice/cpp/include/Ice/Process.h +2 -2
  31. data/ext/ice/cpp/include/Ice/ProcessF.h +2 -2
  32. data/ext/ice/cpp/include/Ice/Properties.h +2 -2
  33. data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +2 -2
  34. data/ext/ice/cpp/include/Ice/PropertiesF.h +2 -2
  35. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +55 -0
  36. data/ext/ice/cpp/include/Ice/RemoteLogger.h +2 -2
  37. data/ext/ice/cpp/include/Ice/Router.h +2 -2
  38. data/ext/ice/cpp/include/Ice/RouterF.h +2 -2
  39. data/ext/ice/cpp/include/Ice/ServantLocator.h +2 -2
  40. data/ext/ice/cpp/include/Ice/ServantLocatorF.h +2 -2
  41. data/ext/ice/cpp/include/Ice/SliceChecksumDict.h +2 -2
  42. data/ext/ice/cpp/include/Ice/Version.h +2 -2
  43. data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +4 -6
  44. data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +3 -5
  45. data/ext/ice/cpp/include/IceUtil/Config.h +5 -5
  46. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +2 -2
  47. data/ext/ice/cpp/src/Ice/Communicator.cpp +2 -2
  48. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +2 -2
  49. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +0 -1
  50. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +12 -17
  51. data/ext/ice/cpp/src/Ice/Connection.cpp +2 -2
  52. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +2 -2
  53. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +33 -4
  54. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +8 -0
  55. data/ext/ice/cpp/src/Ice/Current.cpp +2 -2
  56. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +0 -1
  57. data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +2 -0
  58. data/ext/ice/cpp/src/Ice/Endpoint.cpp +2 -2
  59. data/ext/ice/cpp/src/Ice/EndpointF.cpp +2 -2
  60. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +2 -2
  61. data/ext/ice/cpp/src/Ice/FacetMap.cpp +2 -2
  62. data/ext/ice/cpp/src/Ice/HttpParser.cpp +0 -2
  63. data/ext/ice/cpp/src/Ice/Identity.cpp +2 -2
  64. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +2 -2
  65. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +2 -2
  66. data/ext/ice/cpp/src/Ice/Initialize.cpp +25 -30
  67. data/ext/ice/cpp/src/Ice/Instance.cpp +1 -3
  68. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +2 -2
  69. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
  70. data/ext/ice/cpp/src/Ice/LocalException.cpp +2 -2
  71. data/ext/ice/cpp/src/Ice/Locator.cpp +2 -2
  72. data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
  73. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +6 -6
  74. data/ext/ice/cpp/src/Ice/LocatorInfo.h +9 -8
  75. data/ext/ice/cpp/src/Ice/Logger.cpp +2 -2
  76. data/ext/ice/cpp/src/Ice/LoggerF.cpp +2 -2
  77. data/ext/ice/cpp/src/Ice/Metrics.cpp +10 -2
  78. data/ext/ice/cpp/src/Ice/Network.h +10 -0
  79. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +2 -2
  80. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +2 -2
  81. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +68 -143
  82. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -2
  83. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +2 -2
  84. data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +2 -2
  85. data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -1
  86. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +0 -1
  87. data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
  88. data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
  89. data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
  90. data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
  91. data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
  92. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
  93. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +6 -7
  94. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
  95. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +17 -18
  96. data/ext/ice/cpp/src/Ice/Reference.cpp +1 -1
  97. data/ext/ice/cpp/src/Ice/{RegisterPlugins.cpp → RegisterPluginsInit.cpp} +1 -1
  98. data/ext/ice/cpp/src/Ice/{RegisterPlugins.h → RegisterPluginsInit.h} +2 -2
  99. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +2 -2
  100. data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
  101. data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
  102. data/ext/ice/cpp/src/Ice/Selector.cpp +51 -45
  103. data/ext/ice/cpp/src/Ice/Selector.h +4 -4
  104. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +2 -2
  105. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +2 -2
  106. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +2 -2
  107. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +7 -2
  108. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +15 -3
  109. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +0 -2
  110. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +46 -47
  111. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +28 -8
  112. data/ext/ice/cpp/src/Ice/Version.cpp +2 -2
  113. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +26 -2
  114. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +2 -2
  115. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +2 -2
  116. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +11 -0
  117. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
  118. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +2 -2
  119. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +11 -0
  120. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +2 -2
  121. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +2 -2
  122. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +1 -3
  123. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +11 -0
  124. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +7 -0
  125. data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -1
  126. data/ext/ice/cpp/src/IceUtil/Exception.cpp +2 -1
  127. data/ext/ice/cpp/src/Slice/FileTracker.cpp +3 -2
  128. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +0 -1
  129. data/ext/ice/cpp/src/Slice/Parser.cpp +35 -9
  130. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +10 -11
  131. data/ext/ice/cpp/src/Slice/Python.cpp +54 -36
  132. data/ext/ice/mcpp/Makefile +10 -0
  133. data/ext/ice/mcpp/Makefile.mak +23 -15
  134. data/ice.gemspec +1 -2
  135. data/lib/Glacier2/Metrics.rb +1 -1
  136. data/lib/Glacier2/PermissionsVerifier.rb +1 -1
  137. data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
  138. data/lib/Glacier2/Router.rb +1 -1
  139. data/lib/Glacier2/RouterF.rb +1 -1
  140. data/lib/Glacier2/SSLInfo.rb +1 -1
  141. data/lib/Glacier2/Session.rb +1 -1
  142. data/lib/Ice.rb +1 -0
  143. data/lib/Ice/BuiltinSequences.rb +1 -1
  144. data/lib/Ice/Communicator.rb +1 -1
  145. data/lib/Ice/CommunicatorF.rb +1 -1
  146. data/lib/Ice/Connection.rb +1 -1
  147. data/lib/Ice/ConnectionF.rb +1 -1
  148. data/lib/Ice/Current.rb +1 -1
  149. data/lib/Ice/Endpoint.rb +1 -1
  150. data/lib/Ice/EndpointF.rb +1 -1
  151. data/lib/Ice/EndpointTypes.rb +1 -1
  152. data/lib/Ice/FacetMap.rb +1 -1
  153. data/lib/Ice/Identity.rb +1 -1
  154. data/lib/Ice/ImplicitContext.rb +1 -1
  155. data/lib/Ice/ImplicitContextF.rb +1 -1
  156. data/lib/Ice/Instrumentation.rb +1 -1
  157. data/lib/Ice/InstrumentationF.rb +1 -1
  158. data/lib/Ice/LocalException.rb +1 -1
  159. data/lib/Ice/Locator.rb +1 -1
  160. data/lib/Ice/LocatorF.rb +1 -1
  161. data/lib/Ice/Logger.rb +1 -1
  162. data/lib/Ice/LoggerF.rb +1 -1
  163. data/lib/Ice/Metrics.rb +1 -1
  164. data/lib/Ice/ObjectAdapterF.rb +1 -1
  165. data/lib/Ice/ObjectFactory.rb +1 -1
  166. data/lib/Ice/ObjectFactoryF.rb +1 -1
  167. data/lib/Ice/Plugin.rb +1 -1
  168. data/lib/Ice/PluginF.rb +1 -1
  169. data/lib/Ice/Process.rb +1 -1
  170. data/lib/Ice/ProcessF.rb +1 -1
  171. data/lib/Ice/Properties.rb +1 -1
  172. data/lib/Ice/PropertiesAdmin.rb +1 -1
  173. data/lib/Ice/PropertiesF.rb +1 -1
  174. data/lib/Ice/RemoteLogger.rb +292 -0
  175. data/lib/Ice/Router.rb +1 -1
  176. data/lib/Ice/RouterF.rb +1 -1
  177. data/lib/Ice/SliceChecksumDict.rb +1 -1
  178. data/lib/Ice/Version.rb +1 -1
  179. data/lib/IceBox/IceBox.rb +1 -1
  180. data/lib/IceGrid/Admin.rb +1 -1
  181. data/lib/IceGrid/Descriptor.rb +1 -1
  182. data/lib/IceGrid/Exception.rb +1 -1
  183. data/lib/IceGrid/FileParser.rb +1 -1
  184. data/lib/IceGrid/Locator.rb +1 -1
  185. data/lib/IceGrid/Observer.rb +1 -1
  186. data/lib/IceGrid/Query.rb +1 -1
  187. data/lib/IceGrid/Registry.rb +1 -1
  188. data/lib/IceGrid/Session.rb +1 -1
  189. data/lib/IceGrid/UserAccountMapper.rb +1 -1
  190. data/lib/IcePatch2/FileInfo.rb +1 -1
  191. data/lib/IcePatch2/FileServer.rb +1 -1
  192. data/lib/IceStorm/IceStorm.rb +1 -1
  193. data/lib/IceStorm/Metrics.rb +1 -1
  194. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +4 -0
  195. metadata +6 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9c32676b4cadc1bc932c034963bf2840c4ab95d5
4
- data.tar.gz: f6f764dd8f1f1268cc22be2cc4665c12591c02d5
3
+ metadata.gz: 93ae1c7492077c2bf6a1917af0ab3cefd22c7dc2
4
+ data.tar.gz: 028210b1df370395a056c428b24ed6f6e25cb3b1
5
5
  SHA512:
6
- metadata.gz: 4ea6bdcb9a610d2d47a9b84fffc47cd442230407c5251b2c86ae4725171bcc1ec72dbe65e3c6066a76dc2635fcd7027291c673a0524f07ad7bad4f62141c11cd
7
- data.tar.gz: 02adf655a449f8c264c789b302a9f51423307b02fcc612a85053db05d275a23d4db39675e6a6e734885387c6ac4e820bc78d60bfabbdc69139e951d7e73aaf45
6
+ metadata.gz: f9770c1aab524d71ac1fe8d7b87d7260edb43d1a7d1fa9ae5cf111536c25e62785cdf1be95cf869524adba63350182351b7dd9698466be55d7236b3ba01050dd
7
+ data.tar.gz: 0f6617e0929f39b4025723b3c5cf60c6813392e365d3f2a3847ff22a3bde98cad218778be2c2a16f91f1f2995a975e5d23de6d71da7af7667a68efce358e2857
data/ext/ice/cpp/include/Ice/BuiltinSequences.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/Communicator.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -55,7 +55,7 @@
55
55
  # if ICE_INT_VERSION % 100 > 50
56
56
  # error Beta header file detected
57
57
  # endif
58
- # if ICE_INT_VERSION % 100 < 0
58
+ # if ICE_INT_VERSION % 100 < 1
59
59
  # error Ice patch level mismatch!
60
60
  # endif
61
61
  #endif
data/ext/ice/cpp/include/Ice/CommunicatorF.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/Connection.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -43,7 +43,7 @@
43
43
  # if ICE_INT_VERSION % 100 > 50
44
44
  # error Beta header file detected
45
45
  # endif
46
- # if ICE_INT_VERSION % 100 < 0
46
+ # if ICE_INT_VERSION % 100 < 1
47
47
  # error Ice patch level mismatch!
48
48
  # endif
49
49
  #endif
@@ -371,8 +371,7 @@ public:
371
371
  }
372
372
 
373
373
  IPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort) :
374
- ::Ice::ConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize)
375
- ,
374
+ ::Ice::ConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize),
376
375
  localAddress(__ice_localAddress),
377
376
  localPort(__ice_localPort),
378
377
  remoteAddress(__ice_remoteAddress),
@@ -418,7 +417,6 @@ public:
418
417
 
419
418
  TCPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort) :
420
419
  ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
421
-
422
420
  {
423
421
  }
424
422
 
@@ -448,8 +446,7 @@ public:
448
446
  }
449
447
 
450
448
  UDPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::std::string& __ice_mcastAddress, ::Ice::Int __ice_mcastPort) :
451
- ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
452
- ,
449
+ ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort),
453
450
  mcastAddress(__ice_mcastAddress),
454
451
  mcastPort(__ice_mcastPort)
455
452
  {
@@ -488,8 +485,7 @@ public:
488
485
  }
489
486
 
490
487
  WSConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::Ice::HeaderDict& __ice_headers) :
491
- ::Ice::TCPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
492
- ,
488
+ ::Ice::TCPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort),
493
489
  headers(__ice_headers)
494
490
  {
495
491
  }
data/ext/ice/cpp/include/Ice/ConnectionF.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/Current.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -42,7 +42,7 @@
42
42
  # if ICE_INT_VERSION % 100 > 50
43
43
  # error Beta header file detected
44
44
  # endif
45
- # if ICE_INT_VERSION % 100 < 0
45
+ # if ICE_INT_VERSION % 100 < 1
46
46
  # error Ice patch level mismatch!
47
47
  # endif
48
48
  #endif
data/ext/ice/cpp/include/Ice/Endpoint.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -41,7 +41,7 @@
41
41
  # if ICE_INT_VERSION % 100 > 50
42
42
  # error Beta header file detected
43
43
  # endif
44
- # if ICE_INT_VERSION % 100 < 0
44
+ # if ICE_INT_VERSION % 100 < 1
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
@@ -193,8 +193,7 @@ public:
193
193
  }
194
194
 
195
195
  IPEndpointInfo(::Ice::Int __ice_timeout, bool __ice_compress, const ::std::string& __ice_host, ::Ice::Int __ice_port, const ::std::string& __ice_sourceAddress) :
196
- ::Ice::EndpointInfo(__ice_timeout, __ice_compress)
197
- ,
196
+ ::Ice::EndpointInfo(__ice_timeout, __ice_compress),
198
197
  host(__ice_host),
199
198
  port(__ice_port),
200
199
  sourceAddress(__ice_sourceAddress)
@@ -233,7 +232,6 @@ public:
233
232
 
234
233
  TCPEndpointInfo(::Ice::Int __ice_timeout, bool __ice_compress, const ::std::string& __ice_host, ::Ice::Int __ice_port, const ::std::string& __ice_sourceAddress) :
235
234
  ::Ice::IPEndpointInfo(__ice_timeout, __ice_compress, __ice_host, __ice_port, __ice_sourceAddress)
236
-
237
235
  {
238
236
  }
239
237
 
@@ -260,8 +258,7 @@ public:
260
258
  }
261
259
 
262
260
  UDPEndpointInfo(::Ice::Int __ice_timeout, bool __ice_compress, const ::std::string& __ice_host, ::Ice::Int __ice_port, const ::std::string& __ice_sourceAddress, const ::std::string& __ice_mcastInterface, ::Ice::Int __ice_mcastTtl) :
263
- ::Ice::IPEndpointInfo(__ice_timeout, __ice_compress, __ice_host, __ice_port, __ice_sourceAddress)
264
- ,
261
+ ::Ice::IPEndpointInfo(__ice_timeout, __ice_compress, __ice_host, __ice_port, __ice_sourceAddress),
265
262
  mcastInterface(__ice_mcastInterface),
266
263
  mcastTtl(__ice_mcastTtl)
267
264
  {
@@ -296,8 +293,7 @@ public:
296
293
  }
297
294
 
298
295
  WSEndpointInfo(::Ice::Int __ice_timeout, bool __ice_compress, const ::std::string& __ice_host, ::Ice::Int __ice_port, const ::std::string& __ice_sourceAddress, const ::std::string& __ice_resource) :
299
- ::Ice::TCPEndpointInfo(__ice_timeout, __ice_compress, __ice_host, __ice_port, __ice_sourceAddress)
300
- ,
296
+ ::Ice::TCPEndpointInfo(__ice_timeout, __ice_compress, __ice_host, __ice_port, __ice_sourceAddress),
301
297
  resource(__ice_resource)
302
298
  {
303
299
  }
@@ -329,8 +325,7 @@ public:
329
325
  }
330
326
 
331
327
  OpaqueEndpointInfo(::Ice::Int __ice_timeout, bool __ice_compress, const ::Ice::EncodingVersion& __ice_rawEncoding, const ::Ice::ByteSeq& __ice_rawBytes) :
332
- ::Ice::EndpointInfo(__ice_timeout, __ice_compress)
333
- ,
328
+ ::Ice::EndpointInfo(__ice_timeout, __ice_compress),
334
329
  rawEncoding(__ice_rawEncoding),
335
330
  rawBytes(__ice_rawBytes)
336
331
  {
data/ext/ice/cpp/include/Ice/EndpointF.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/EndpointTypes.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/FacetMap.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/Ice.h CHANGED
@@ -50,6 +50,7 @@
50
50
  #if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
51
51
  # include <Ice/Service.h>
52
52
  #endif
53
+ #include <Ice/RegisterPlugins.h>
53
54
  #include <IceUtil/PopDisableWarnings.h>
54
55
 
55
56
  #endif
data/ext/ice/cpp/include/Ice/Identity.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/ImplicitContext.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -40,7 +40,7 @@
40
40
  # if ICE_INT_VERSION % 100 > 50
41
41
  # error Beta header file detected
42
42
  # endif
43
- # if ICE_INT_VERSION % 100 < 0
43
+ # if ICE_INT_VERSION % 100 < 1
44
44
  # error Ice patch level mismatch!
45
45
  # endif
46
46
  #endif
data/ext/ice/cpp/include/Ice/ImplicitContextF.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/Instrumentation.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -41,7 +41,7 @@
41
41
  # if ICE_INT_VERSION % 100 > 50
42
42
  # error Beta header file detected
43
43
  # endif
44
- # if ICE_INT_VERSION % 100 < 0
44
+ # if ICE_INT_VERSION % 100 < 1
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
data/ext/ice/cpp/include/Ice/InstrumentationF.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/include/Ice/LocalException.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -41,7 +41,7 @@
41
41
  # if ICE_INT_VERSION % 100 > 50
42
42
  # error Beta header file detected
43
43
  # endif
44
- # if ICE_INT_VERSION % 100 < 0
44
+ # if ICE_INT_VERSION % 100 < 1
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
data/ext/ice/cpp/include/Ice/Locator.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -47,7 +47,7 @@
47
47
  # if ICE_INT_VERSION % 100 > 50
48
48
  # error Beta header file detected
49
49
  # endif
50
- # if ICE_INT_VERSION % 100 < 0
50
+ # if ICE_INT_VERSION % 100 < 1
51
51
  # error Ice patch level mismatch!
52
52
  # endif
53
53
  #endif
data/ext/ice/cpp/include/Ice/LocatorF.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -39,7 +39,7 @@
39
39
  # if ICE_INT_VERSION % 100 > 50
40
40
  # error Beta header file detected
41
41
  # endif
42
- # if ICE_INT_VERSION % 100 < 0
42
+ # if ICE_INT_VERSION % 100 < 1
43
43
  # error Ice patch level mismatch!
44
44
  # endif
45
45
  #endif
data/ext/ice/cpp/include/Ice/Logger.h CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // **********************************************************************
9
9
  //
10
- // Ice version 3.6.0
10
+ // Ice version 3.6.1
11
11
  //
12
12
  // <auto-generated>
13
13
  //
@@ -38,7 +38,7 @@
38
38
  # if ICE_INT_VERSION % 100 > 50
39
39
  # error Beta header file detected
40
40
  # endif
41
- # if ICE_INT_VERSION % 100 < 0
41
+ # if ICE_INT_VERSION % 100 < 1
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif