zeroc-ice 3.7.3 → 3.7.4

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 (181) hide show
  1. checksums.yaml +4 -4
  2. data/ext/Util.cpp +15 -3
  3. data/ext/Util.h +36 -0
  4. data/ext/ice/cpp/include/Ice/Initialize.h +1 -1
  5. data/ext/ice/cpp/include/Ice/Optional.h +1 -1
  6. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -0
  7. data/ext/ice/cpp/include/Ice/Proxy.h +31 -9
  8. data/ext/ice/cpp/include/IceUtil/Config.h +2 -2
  9. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +2 -2
  10. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
  11. data/ext/ice/cpp/include/generated/Ice/Communicator.h +4 -4
  12. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
  13. data/ext/ice/cpp/include/generated/Ice/Connection.h +13 -13
  14. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +2 -2
  15. data/ext/ice/cpp/include/generated/Ice/Current.h +2 -2
  16. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +14 -14
  17. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +2 -2
  18. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
  19. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +2 -2
  20. data/ext/ice/cpp/include/generated/Ice/Identity.h +2 -2
  21. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +2 -2
  22. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +2 -2
  23. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +2 -2
  24. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +2 -2
  25. data/ext/ice/cpp/include/generated/Ice/LocalException.h +61 -61
  26. data/ext/ice/cpp/include/generated/Ice/Locator.h +9 -9
  27. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +2 -2
  28. data/ext/ice/cpp/include/generated/Ice/Logger.h +2 -2
  29. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +2 -2
  30. data/ext/ice/cpp/include/generated/Ice/Metrics.h +18 -18
  31. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +2 -2
  32. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +2 -2
  33. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +2 -2
  34. data/ext/ice/cpp/include/generated/Ice/Plugin.h +2 -2
  35. data/ext/ice/cpp/include/generated/Ice/PluginF.h +2 -2
  36. data/ext/ice/cpp/include/generated/Ice/Process.h +4 -4
  37. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +2 -2
  38. data/ext/ice/cpp/include/generated/Ice/Properties.h +2 -2
  39. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +5 -5
  40. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
  41. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +7 -7
  42. data/ext/ice/cpp/include/generated/Ice/Router.h +6 -6
  43. data/ext/ice/cpp/include/generated/Ice/RouterF.h +2 -2
  44. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +2 -2
  45. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +2 -2
  46. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
  47. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +2 -2
  48. data/ext/ice/cpp/include/generated/Ice/Version.h +2 -2
  49. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +5 -5
  50. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
  51. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -3
  52. data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
  53. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +2 -2
  54. data/ext/ice/cpp/src/Ice/Communicator.cpp +2 -2
  55. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +2 -2
  56. data/ext/ice/cpp/src/Ice/Connection.cpp +2 -2
  57. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +2 -2
  58. data/ext/ice/cpp/src/Ice/Current.cpp +2 -2
  59. data/ext/ice/cpp/src/Ice/Endpoint.cpp +2 -2
  60. data/ext/ice/cpp/src/Ice/EndpointF.cpp +2 -2
  61. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +2 -2
  62. data/ext/ice/cpp/src/Ice/FacetMap.cpp +2 -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/ImplicitContextI.cpp +1 -1
  67. data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -1
  68. data/ext/ice/cpp/src/Ice/InputStream.cpp +1 -1
  69. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +2 -2
  70. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
  71. data/ext/ice/cpp/src/Ice/LocalException.cpp +2 -2
  72. data/ext/ice/cpp/src/Ice/Locator.cpp +2 -2
  73. data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
  74. data/ext/ice/cpp/src/Ice/Logger.cpp +2 -2
  75. data/ext/ice/cpp/src/Ice/LoggerF.cpp +2 -2
  76. data/ext/ice/cpp/src/Ice/Metrics.cpp +2 -2
  77. data/ext/ice/cpp/src/Ice/Network.cpp +1 -1
  78. data/ext/ice/cpp/src/Ice/Network.h +0 -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/ObjectFactory.cpp +2 -2
  82. data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
  83. data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
  84. data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
  85. data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
  86. data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
  87. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
  88. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
  89. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +9 -0
  90. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +2 -2
  91. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +5 -2
  92. data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
  93. data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
  94. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +2 -2
  95. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +2 -2
  96. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +2 -2
  97. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +0 -0
  98. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +0 -0
  99. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +2 -2
  100. data/ext/ice/cpp/src/Ice/Version.cpp +2 -2
  101. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +2 -2
  102. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +479 -6
  103. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
  104. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +4 -4
  105. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +12 -1
  106. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +2 -2
  107. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +2 -2
  108. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +2 -2
  109. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -1
  110. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +1 -1
  111. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +0 -0
  112. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
  113. data/ext/ice/cpp/src/IceSSL/Util.cpp +0 -0
  114. data/ext/ice/cpp/src/IceUtil/Time.cpp +2 -2
  115. data/ext/ice/cpp/src/Slice/Parser.cpp +1 -1
  116. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +12 -0
  117. data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -1
  118. data/ice.gemspec +1 -1
  119. data/lib/Glacier2/Metrics.rb +1 -1
  120. data/lib/Glacier2/PermissionsVerifier.rb +1 -1
  121. data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
  122. data/lib/Glacier2/Router.rb +1 -1
  123. data/lib/Glacier2/RouterF.rb +1 -1
  124. data/lib/Glacier2/SSLInfo.rb +1 -1
  125. data/lib/Glacier2/Session.rb +1 -1
  126. data/lib/Ice/BuiltinSequences.rb +1 -1
  127. data/lib/Ice/Communicator.rb +1 -1
  128. data/lib/Ice/CommunicatorF.rb +1 -1
  129. data/lib/Ice/Connection.rb +1 -1
  130. data/lib/Ice/ConnectionF.rb +1 -1
  131. data/lib/Ice/Current.rb +1 -1
  132. data/lib/Ice/Endpoint.rb +1 -1
  133. data/lib/Ice/EndpointF.rb +1 -1
  134. data/lib/Ice/EndpointTypes.rb +1 -1
  135. data/lib/Ice/FacetMap.rb +1 -1
  136. data/lib/Ice/Identity.rb +1 -1
  137. data/lib/Ice/ImplicitContext.rb +1 -1
  138. data/lib/Ice/ImplicitContextF.rb +1 -1
  139. data/lib/Ice/Instrumentation.rb +1 -1
  140. data/lib/Ice/InstrumentationF.rb +1 -1
  141. data/lib/Ice/LocalException.rb +1 -1
  142. data/lib/Ice/Locator.rb +1 -1
  143. data/lib/Ice/LocatorF.rb +1 -1
  144. data/lib/Ice/Logger.rb +1 -1
  145. data/lib/Ice/LoggerF.rb +1 -1
  146. data/lib/Ice/Metrics.rb +1 -1
  147. data/lib/Ice/ObjectAdapter.rb +1 -1
  148. data/lib/Ice/ObjectAdapterF.rb +1 -1
  149. data/lib/Ice/ObjectFactory.rb +1 -1
  150. data/lib/Ice/Plugin.rb +1 -1
  151. data/lib/Ice/PluginF.rb +1 -1
  152. data/lib/Ice/Process.rb +1 -1
  153. data/lib/Ice/ProcessF.rb +1 -1
  154. data/lib/Ice/Properties.rb +1 -1
  155. data/lib/Ice/PropertiesAdmin.rb +1 -1
  156. data/lib/Ice/PropertiesF.rb +1 -1
  157. data/lib/Ice/RemoteLogger.rb +1 -1
  158. data/lib/Ice/Router.rb +1 -1
  159. data/lib/Ice/RouterF.rb +1 -1
  160. data/lib/Ice/ServantLocator.rb +1 -1
  161. data/lib/Ice/ServantLocatorF.rb +1 -1
  162. data/lib/Ice/SliceChecksumDict.rb +1 -1
  163. data/lib/Ice/ValueFactory.rb +1 -1
  164. data/lib/Ice/Version.rb +1 -1
  165. data/lib/IceBox/IceBox.rb +1 -1
  166. data/lib/IceGrid/Admin.rb +1 -1
  167. data/lib/IceGrid/Descriptor.rb +1 -1
  168. data/lib/IceGrid/Exception.rb +1 -1
  169. data/lib/IceGrid/FileParser.rb +1 -1
  170. data/lib/IceGrid/PluginFacade.rb +1 -1
  171. data/lib/IceGrid/Registry.rb +1 -1
  172. data/lib/IceGrid/Session.rb +1 -1
  173. data/lib/IceGrid/UserAccountMapper.rb +1 -1
  174. data/lib/IcePatch2/FileInfo.rb +1 -1
  175. data/lib/IcePatch2/FileServer.rb +1 -1
  176. data/lib/IceStorm/IceStorm.rb +1 -1
  177. data/lib/IceStorm/Metrics.rb +1 -1
  178. data/slice/Ice/Communicator.ice +1 -1
  179. data/slice/IceBox/IceBox.ice +17 -2
  180. data/slice/IceDiscovery/IceDiscovery.ice +56 -0
  181. metadata +2 -2
data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.3
5
+ // Ice version 3.7.4
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 3
41
+ # if ICE_INT_VERSION % 100 < 4
42
42
  # error Ice patch level mismatch!
43
43
  # endif
44
44
  #endif
data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.3
5
+ // Ice version 3.7.4
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -44,7 +44,7 @@
44
44
  # if ICE_INT_VERSION % 100 >= 50
45
45
  # error Beta header file detected
46
46
  # endif
47
- # if ICE_INT_VERSION % 100 < 3
47
+ # if ICE_INT_VERSION % 100 < 4
48
48
  # error Ice patch level mismatch!
49
49
  # endif
50
50
  #endif
@@ -242,7 +242,7 @@ public:
242
242
  ::std::function<void(bool)> sent = nullptr,
243
243
  const ::Ice::Context& context = ::Ice::noExplicitContext)
244
244
  {
245
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, prx, context);
245
+ return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, prx, context);
246
246
  }
247
247
 
248
248
  /// \cond INTERNAL
@@ -328,7 +328,7 @@ public:
328
328
  ::std::function<void(bool)> sent = nullptr,
329
329
  const ::Ice::Context& context = ::Ice::noExplicitContext)
330
330
  {
331
- return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, instanceName, reply, context);
331
+ return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, instanceName, reply, context);
332
332
  }
333
333
 
334
334
  /// \cond INTERNAL
data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp CHANGED
@@ -706,7 +706,18 @@ void
706
706
  LocatorI::foundLocator(const Ice::LocatorPrxPtr& locator)
707
707
  {
708
708
  Lock sync(*this);
709
- if(!locator || (!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName))
709
+
710
+ if(!locator)
711
+ {
712
+ if(_traceLevel > 2)
713
+ {
714
+ Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
715
+ out << "ignoring locator reply: (null locator)";
716
+ }
717
+ return;
718
+ }
719
+
720
+ if(!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName)
710
721
  {
711
722
  if(_traceLevel > 2)
712
723
  {
data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.3
5
+ // Ice version 3.7.4
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -37,7 +37,7 @@
37
37
  # if ICE_INT_VERSION % 100 >= 50
38
38
  # error Beta header file detected
39
39
  # endif
40
- # if ICE_INT_VERSION % 100 < 3
40
+ # if ICE_INT_VERSION % 100 < 4
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.3
5
+ // Ice version 3.7.4
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -35,7 +35,7 @@
35
35
  # if ICE_INT_VERSION % 100 >= 50
36
36
  # error Beta header file detected
37
37
  # endif
38
- # if ICE_INT_VERSION % 100 < 3
38
+ # if ICE_INT_VERSION % 100 < 4
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.3
5
+ // Ice version 3.7.4
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -37,7 +37,7 @@
37
37
  # if ICE_INT_VERSION % 100 >= 50
38
38
  # error Beta header file detected
39
39
  # endif
40
- # if ICE_INT_VERSION % 100 < 3
40
+ # if ICE_INT_VERSION % 100 < 4
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp CHANGED
@@ -228,7 +228,7 @@ ASMUtcTimeToTime(const ASN1_UTCTIME* s)
228
228
  # pragma warning(default:4996) // localtime is depercated
229
229
  #endif
230
230
 
231
- IceUtil::Time time = IceUtil::Time::seconds(mktime(&tm) - offset * 60 + tzone);
231
+ IceUtil::Time time = IceUtil::Time::seconds(mktime(&tm) - IceUtil::Int64(offset) * 60 + tzone);
232
232
 
233
233
  #ifdef ICE_CPP11_MAPPING
234
234
  return chrono::system_clock::time_point(chrono::microseconds(time.toMicroSeconds()));
data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp CHANGED
@@ -346,7 +346,7 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
346
346
  // Peer hostname verification is new in OpenSSL 1.0.2 for older versions
347
347
  // We use IceSSL built-in hostname verification.
348
348
  //
349
- _engine->verifyPeerCertName(address, info);
349
+ _engine->verifyPeerCertName(_host, ICE_DYNAMIC_CAST(ConnectionInfo, getInfo()));
350
350
  }
351
351
  catch(const SecurityException&)
352
352
  {
data/ext/ice/cpp/src/IceSSL/PluginI.cpp CHANGED
File without changes
data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp CHANGED
@@ -121,7 +121,7 @@ checkTrustResult(SecTrustRef trust,
121
121
  if(engine->getCheckCertName() && !host.empty())
122
122
  {
123
123
  UniqueRef<CFStringRef> hostref(toCFString(host));
124
- UniqueRef<SecPolicyRef> policy(SecPolicyCreateSSL(false, hostref.get()));
124
+ UniqueRef<SecPolicyRef> policy(SecPolicyCreateSSL(true, hostref.get()));
125
125
  UniqueRef<CFArrayRef> policies;
126
126
  if((err = SecTrustCopyPolicies(trust, &policies.get())))
127
127
  {
data/ext/ice/cpp/src/IceSSL/Util.cpp CHANGED
File without changes
data/ext/ice/cpp/src/IceUtil/Time.cpp CHANGED
@@ -97,7 +97,7 @@ IceUtil::Time::now(Clock clock)
97
97
  struct timeb tb;
98
98
  ftime(&tb);
99
99
  # endif
100
- return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000);
100
+ return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + Int64(tb.millitm) * 1000);
101
101
  #else
102
102
  struct timeval tv;
103
103
  if(gettimeofday(&tv, 0) < 0)
@@ -130,7 +130,7 @@ IceUtil::Time::now(Clock clock)
130
130
  struct timeb tb;
131
131
  ftime(&tb);
132
132
  # endif
133
- return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000);
133
+ return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + Int64(tb.millitm) * 1000);
134
134
  }
135
135
  #elif defined(__hppa)
136
136
  //
data/ext/ice/cpp/src/Slice/Parser.cpp CHANGED
@@ -3780,7 +3780,7 @@ void
3780
3780
  Slice::ClassDef::destroy()
3781
3781
  {
3782
3782
  _declaration = 0;
3783
- _bases.empty();
3783
+ _bases.clear();
3784
3784
  Container::destroy();
3785
3785
  }
3786
3786
 
data/ext/ice/cpp/src/Slice/Preprocessor.cpp CHANGED
@@ -721,6 +721,18 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
721
721
  }
722
722
  break;
723
723
  }
724
+ case Swift:
725
+ {
726
+ //
727
+ // Change .o[bj] suffix to .swift suffix.
728
+ //
729
+ pos = 0;
730
+ if ((pos = result.find(suffix)) != string::npos)
731
+ {
732
+ result.replace(pos, suffix.size() - 1, ".swift");
733
+ }
734
+ break;
735
+ }
724
736
  default:
725
737
  {
726
738
  assert(false);
data/ext/ice/cpp/src/Slice/Preprocessor.h CHANGED
@@ -27,7 +27,7 @@ public:
27
27
  FILE* preprocess(bool, const std::vector<std::string>&);
28
28
  bool close();
29
29
 
30
- enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML, MATLAB };
30
+ enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML, MATLAB, Swift };
31
31
 
32
32
  bool printMakefileDependencies(std::ostream&, Language, const std::vector<std::string>&, const std::string& = "",
33
33
  const std::string& = "cpp", const std::string& = "");
data/ice.gemspec CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = 'zeroc-ice'
7
- s.version = '3.7.3'
7
+ s.version = '3.7.4'
8
8
  s.summary = "ZeroC Ice for Ruby"
9
9
  s.description = <<-eos
10
10
  The Internet Communications Engine (Ice) provides a robust, proven
data/lib/Glacier2/Metrics.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Glacier2/PermissionsVerifier.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Glacier2/PermissionsVerifierF.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Glacier2/Router.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Glacier2/RouterF.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Glacier2/SSLInfo.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Glacier2/Session.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/BuiltinSequences.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/Communicator.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/CommunicatorF.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/Connection.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/ConnectionF.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/Current.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/Endpoint.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/EndpointF.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/EndpointTypes.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/FacetMap.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/Identity.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/ImplicitContext.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/ImplicitContextF.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/Instrumentation.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #
data/lib/Ice/InstrumentationF.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright (c) ZeroC, Inc. All rights reserved.
4
4
  #
5
5
  #
6
- # Ice version 3.7.3
6
+ # Ice version 3.7.4
7
7
  #
8
8
  # <auto-generated>
9
9
  #