zeroc-ice 3.7.6 → 3.7.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (183) hide show
  1. checksums.yaml +4 -4
  2. data/ext/Config.h +5 -0
  3. data/ext/ice/cpp/include/Ice/Functional.h +3 -1
  4. data/ext/ice/cpp/include/Ice/Object.h +2 -0
  5. data/ext/ice/cpp/include/Ice/Proxy.h +25 -16
  6. data/ext/ice/cpp/include/IceSSL/Plugin.h +84 -0
  7. data/ext/ice/cpp/include/IceUtil/Config.h +2 -2
  8. data/ext/ice/cpp/include/IceUtil/Functional.h +3 -1
  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 +2 -2
  12. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
  13. data/ext/ice/cpp/include/generated/Ice/Connection.h +2 -2
  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 +2 -2
  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 +2 -2
  26. data/ext/ice/cpp/include/generated/Ice/Locator.h +2 -2
  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 +2 -2
  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 +2 -2
  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 +2 -2
  40. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
  41. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2 -2
  42. data/ext/ice/cpp/include/generated/Ice/Router.h +2 -2
  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 +2 -2
  50. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
  51. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +2 -2
  52. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +2 -2
  53. data/ext/ice/cpp/src/Ice/Communicator.cpp +2 -2
  54. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +2 -2
  55. data/ext/ice/cpp/src/Ice/Connection.cpp +2 -2
  56. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +2 -2
  57. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +3 -3
  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/Instrumentation.cpp +2 -2
  67. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
  68. data/ext/ice/cpp/src/Ice/LocalException.cpp +2 -2
  69. data/ext/ice/cpp/src/Ice/Locator.cpp +2 -2
  70. data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
  71. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +3 -3
  72. data/ext/ice/cpp/src/Ice/Logger.cpp +2 -2
  73. data/ext/ice/cpp/src/Ice/LoggerF.cpp +2 -2
  74. data/ext/ice/cpp/src/Ice/Metrics.cpp +2 -2
  75. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +2 -2
  76. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +2 -2
  77. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +4 -4
  78. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +8 -8
  79. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +2 -2
  80. data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
  81. data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
  82. data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
  83. data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
  84. data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
  85. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
  86. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
  87. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +5 -2
  88. data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
  89. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +2 -2
  90. data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
  91. data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
  92. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +6 -2
  93. data/ext/ice/cpp/src/Ice/SHA1.cpp +2 -0
  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/Thread.cpp +2 -2
  98. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +5 -1
  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 +2 -2
  103. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
  104. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +2 -2
  105. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +23 -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 +110 -5
  110. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +60 -1
  111. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +2 -0
  112. data/ext/ice/cpp/src/IceSSL/PluginI.h +11 -0
  113. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +142 -1
  114. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +45 -30
  115. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +20 -1
  116. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +4 -0
  117. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +133 -2
  118. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +38 -17
  119. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -0
  120. data/ext/ice/cpp/src/Slice/Parser.cpp +4 -0
  121. data/ext/ice/cpp/src/Slice/Parser.h +2 -2
  122. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +8 -0
  123. data/ice.gemspec +1 -1
  124. data/lib/Glacier2/Metrics.rb +1 -1
  125. data/lib/Glacier2/PermissionsVerifier.rb +1 -1
  126. data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
  127. data/lib/Glacier2/Router.rb +1 -1
  128. data/lib/Glacier2/RouterF.rb +1 -1
  129. data/lib/Glacier2/SSLInfo.rb +1 -1
  130. data/lib/Glacier2/Session.rb +1 -1
  131. data/lib/Ice/BuiltinSequences.rb +1 -1
  132. data/lib/Ice/Communicator.rb +1 -1
  133. data/lib/Ice/CommunicatorF.rb +1 -1
  134. data/lib/Ice/Connection.rb +1 -1
  135. data/lib/Ice/ConnectionF.rb +1 -1
  136. data/lib/Ice/Current.rb +1 -1
  137. data/lib/Ice/Endpoint.rb +1 -1
  138. data/lib/Ice/EndpointF.rb +1 -1
  139. data/lib/Ice/EndpointTypes.rb +1 -1
  140. data/lib/Ice/FacetMap.rb +1 -1
  141. data/lib/Ice/Identity.rb +1 -1
  142. data/lib/Ice/ImplicitContext.rb +1 -1
  143. data/lib/Ice/ImplicitContextF.rb +1 -1
  144. data/lib/Ice/Instrumentation.rb +1 -1
  145. data/lib/Ice/InstrumentationF.rb +1 -1
  146. data/lib/Ice/LocalException.rb +1 -1
  147. data/lib/Ice/Locator.rb +1 -1
  148. data/lib/Ice/LocatorF.rb +1 -1
  149. data/lib/Ice/Logger.rb +1 -1
  150. data/lib/Ice/LoggerF.rb +1 -1
  151. data/lib/Ice/Metrics.rb +1 -1
  152. data/lib/Ice/ObjectAdapter.rb +1 -1
  153. data/lib/Ice/ObjectAdapterF.rb +1 -1
  154. data/lib/Ice/ObjectFactory.rb +1 -1
  155. data/lib/Ice/Plugin.rb +1 -1
  156. data/lib/Ice/PluginF.rb +1 -1
  157. data/lib/Ice/Process.rb +1 -1
  158. data/lib/Ice/ProcessF.rb +1 -1
  159. data/lib/Ice/Properties.rb +1 -1
  160. data/lib/Ice/PropertiesAdmin.rb +1 -1
  161. data/lib/Ice/PropertiesF.rb +1 -1
  162. data/lib/Ice/RemoteLogger.rb +1 -1
  163. data/lib/Ice/Router.rb +1 -1
  164. data/lib/Ice/RouterF.rb +1 -1
  165. data/lib/Ice/ServantLocator.rb +1 -1
  166. data/lib/Ice/ServantLocatorF.rb +1 -1
  167. data/lib/Ice/SliceChecksumDict.rb +1 -1
  168. data/lib/Ice/ValueFactory.rb +1 -1
  169. data/lib/Ice/Version.rb +1 -1
  170. data/lib/IceBox/IceBox.rb +1 -1
  171. data/lib/IceGrid/Admin.rb +1 -1
  172. data/lib/IceGrid/Descriptor.rb +1 -1
  173. data/lib/IceGrid/Exception.rb +1 -1
  174. data/lib/IceGrid/FileParser.rb +1 -1
  175. data/lib/IceGrid/PluginFacade.rb +1 -1
  176. data/lib/IceGrid/Registry.rb +1 -1
  177. data/lib/IceGrid/Session.rb +1 -1
  178. data/lib/IceGrid/UserAccountMapper.rb +1 -1
  179. data/lib/IcePatch2/FileInfo.rb +1 -1
  180. data/lib/IcePatch2/FileServer.rb +1 -1
  181. data/lib/IceStorm/IceStorm.rb +1 -1
  182. data/lib/IceStorm/Metrics.rb +1 -1
  183. metadata +2 -2
data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
38
+ # if ICE_INT_VERSION % 100 < 7
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/Ice/Instrumentation.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/InstrumentationF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
38
+ # if ICE_INT_VERSION % 100 < 7
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/Ice/LocalException.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/Locator.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
44
+ # if ICE_INT_VERSION % 100 < 7
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
data/ext/ice/cpp/src/Ice/LocatorF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/LocatorInfo.cpp CHANGED
@@ -133,8 +133,8 @@ IceInternal::LocatorManager::destroy()
133
133
  {
134
134
  IceUtil::Mutex::Lock sync(*this);
135
135
 
136
- #ifdef ICE_CPP11_MAPPING
137
- for_each(_table.begin(), _table.end(), [](pair<shared_ptr<Ice::LocatorPrx>, LocatorInfoPtr> it){ it.second->destroy(); });
136
+ #ifdef ICE_CPP11_COMPILER
137
+ for_each(_table.begin(), _table.end(), [](pair<Ice::LocatorPrxPtr, LocatorInfoPtr> it){ it.second->destroy(); });
138
138
  #else
139
139
  for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const LocatorPrx, LocatorInfo>(&LocatorInfo::destroy));
140
140
  #endif
@@ -773,7 +773,7 @@ IceInternal::LocatorInfo::trace(const string& msg, const ReferencePtr& ref, cons
773
773
 
774
774
  const char* sep = endpoints.size() > 1 ? ":" : "";
775
775
  ostringstream o;
776
- #ifdef ICE_CPP11_MAPPING
776
+ #ifdef ICE_CPP11_COMPILER
777
777
  transform(endpoints.begin(), endpoints.end(), ostream_iterator<string>(o, sep),
778
778
  [](const EndpointPtr& endpoint)
779
779
  {
data/ext/ice/cpp/src/Ice/Logger.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
38
+ # if ICE_INT_VERSION % 100 < 7
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/Ice/LoggerF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
38
+ # if ICE_INT_VERSION % 100 < 7
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/Ice/Metrics.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
44
+ # if ICE_INT_VERSION % 100 < 7
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
44
+ # if ICE_INT_VERSION % 100 < 7
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
38
+ # if ICE_INT_VERSION % 100 < 7
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp CHANGED
@@ -46,7 +46,7 @@ IceInternal::ObjectAdapterFactory::shutdown()
46
46
  // Deactivate outside the thread synchronization, to avoid
47
47
  // deadlocks.
48
48
  //
49
- #ifdef ICE_CPP11_MAPPING
49
+ #ifdef ICE_CPP11_COMPILER
50
50
  for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->deactivate(); });
51
51
  #else
52
52
  for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::deactivate));
@@ -75,7 +75,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown()
75
75
  //
76
76
  // Now we wait for deactivation of each object adapter.
77
77
  //
78
- #ifdef ICE_CPP11_MAPPING
78
+ #ifdef ICE_CPP11_COMPILER
79
79
  for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->waitForDeactivate(); });
80
80
  #else
81
81
  for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::waitForDeactivate));
@@ -108,7 +108,7 @@ IceInternal::ObjectAdapterFactory::destroy()
108
108
  //
109
109
  // Now we destroy each object adapter.
110
110
  //
111
- #ifdef ICE_CPP11_MAPPING
111
+ #ifdef ICE_CPP11_COMPILER
112
112
  for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->destroy(); });
113
113
  #else
114
114
  for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::destroy));
@@ -128,7 +128,7 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)())
128
128
  IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
129
129
  adapters = _adapters;
130
130
  }
131
- #ifdef ICE_CPP11_MAPPING
131
+ #ifdef ICE_CPP11_COMPILER
132
132
  for_each(adapters.begin(), adapters.end(),
133
133
  [fn](const ObjectAdapterIPtr& adapter)
134
134
  {
data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp CHANGED
@@ -98,7 +98,7 @@ Ice::ObjectAdapterI::activate()
98
98
  //
99
99
  if(_state != StateUninitialized)
100
100
  {
101
- #ifdef ICE_CPP11_MAPPING
101
+ #ifdef ICE_CPP11_COMPILER
102
102
  for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
103
103
  [](const IncomingConnectionFactoryPtr& factory)
104
104
  {
@@ -159,7 +159,7 @@ Ice::ObjectAdapterI::activate()
159
159
  IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
160
160
  assert(_state == StateActivating);
161
161
 
162
- #ifdef ICE_CPP11_MAPPING
162
+ #ifdef ICE_CPP11_COMPILER
163
163
  for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
164
164
  [](const IncomingConnectionFactoryPtr& factory)
165
165
  {
@@ -182,7 +182,7 @@ Ice::ObjectAdapterI::hold()
182
182
  checkForDeactivation();
183
183
  _state = StateHeld;
184
184
 
185
- #ifdef ICE_CPP11_MAPPING
185
+ #ifdef ICE_CPP11_COMPILER
186
186
  for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
187
187
  [](const IncomingConnectionFactoryPtr& factory)
188
188
  {
@@ -206,7 +206,7 @@ Ice::ObjectAdapterI::waitForHold()
206
206
  incomingConnectionFactories = _incomingConnectionFactories;
207
207
  }
208
208
 
209
- #ifdef ICE_CPP11_MAPPING
209
+ #ifdef ICE_CPP11_COMPILER
210
210
  for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
211
211
  [](const IncomingConnectionFactoryPtr& factory)
212
212
  {
@@ -269,7 +269,7 @@ Ice::ObjectAdapterI::deactivate() ICE_NOEXCEPT
269
269
  //
270
270
  }
271
271
 
272
- #ifdef ICE_CPP11_MAPPING
272
+ #ifdef ICE_CPP11_COMPILER
273
273
  for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
274
274
  [](const IncomingConnectionFactoryPtr& factory)
275
275
  {
@@ -317,7 +317,7 @@ Ice::ObjectAdapterI::waitForDeactivate() ICE_NOEXCEPT
317
317
  // Now we wait until all incoming connection factories are
318
318
  // finished.
319
319
  //
320
- #ifdef ICE_CPP11_MAPPING
320
+ #ifdef ICE_CPP11_COMPILER
321
321
  for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
322
322
  [](const IncomingConnectionFactoryPtr& factory)
323
323
  {
@@ -639,7 +639,7 @@ Ice::ObjectAdapterI::getEndpoints() const ICE_NOEXCEPT
639
639
  EndpointSeq endpoints;
640
640
  transform(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
641
641
  back_inserter(endpoints),
642
- #ifdef ICE_CPP11_MAPPING
642
+ #ifdef ICE_CPP11_COMPILER
643
643
  [](const IncomingConnectionFactoryPtr& factory)
644
644
  {
645
645
  return factory->endpoint();
@@ -831,7 +831,7 @@ Ice::ObjectAdapterI::updateConnectionObservers()
831
831
  IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
832
832
  f = _incomingConnectionFactories;
833
833
  }
834
- #ifdef ICE_CPP11_MAPPING
834
+ #ifdef ICE_CPP11_COMPILER
835
835
  for_each(f.begin(), f.end(),
836
836
  [](const IncomingConnectionFactoryPtr& factory)
837
837
  {
data/ext/ice/cpp/src/Ice/ObjectFactory.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/Plugin.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/PluginF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
38
+ # if ICE_INT_VERSION % 100 < 7
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/Ice/Process.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
43
+ # if ICE_INT_VERSION % 100 < 7
44
44
  # error Ice patch level mismatch!
45
45
  # endif
46
46
  #endif
data/ext/ice/cpp/src/Ice/ProcessF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/Properties.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
43
+ # if ICE_INT_VERSION % 100 < 7
44
44
  # error Ice patch level mismatch!
45
45
  # endif
46
46
  #endif
data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
43
+ # if ICE_INT_VERSION % 100 < 7
44
44
  # error Ice patch level mismatch!
45
45
  # endif
46
46
  #endif
data/ext/ice/cpp/src/Ice/PropertiesF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/PropertyNames.cpp CHANGED
@@ -1,7 +1,7 @@
1
1
  //
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
- // Generated by makeprops.py from file ./config/PropertyNames.xml, Fri May 28 11:30:40 2021
4
+ // Generated by makeprops.py from file ..\config\PropertyNames.xml, Fri Jan 7 10:30:00 2022
5
5
 
6
6
  // IMPORTANT: Do not edit this file -- any edits made here will be lost!
7
7
 
@@ -1128,6 +1128,7 @@ const IceInternal::Property IceSSLPropsData[] =
1128
1128
  IceInternal::Property("IceSSL.CheckCertName", false, 0),
1129
1129
  IceInternal::Property("IceSSL.CheckCRL", false, 0),
1130
1130
  IceInternal::Property("IceSSL.Ciphers", false, 0),
1131
+ IceInternal::Property("IceSSL.CertificateRevocationListFiles", false, 0),
1131
1132
  IceInternal::Property("IceSSL.DefaultDir", false, 0),
1132
1133
  IceInternal::Property("IceSSL.DH.*", false, 0),
1133
1134
  IceInternal::Property("IceSSL.DHParams", false, 0),
@@ -1135,7 +1136,7 @@ const IceInternal::Property IceSSLPropsData[] =
1135
1136
  IceInternal::Property("IceSSL.FindCert", false, 0),
1136
1137
  IceInternal::Property("IceSSL.FindCert.*", true, 0),
1137
1138
  IceInternal::Property("IceSSL.InitOpenSSL", false, 0),
1138
- IceInternal::Property("IceSSL.KeyFile", true, 0),
1139
+ IceInternal::Property("IceSSL.KeyFile", false, 0),
1139
1140
  IceInternal::Property("IceSSL.Keychain", false, 0),
1140
1141
  IceInternal::Property("IceSSL.KeychainPassword", false, 0),
1141
1142
  IceInternal::Property("IceSSL.Keystore", false, 0),
@@ -1148,6 +1149,8 @@ const IceInternal::Property IceSSLPropsData[] =
1148
1149
  IceInternal::Property("IceSSL.ProtocolVersionMax", false, 0),
1149
1150
  IceInternal::Property("IceSSL.ProtocolVersionMin", false, 0),
1150
1151
  IceInternal::Property("IceSSL.Random", false, 0),
1152
+ IceInternal::Property("IceSSL.RevocationCheck", false, 0),
1153
+ IceInternal::Property("IceSSL.RevocationCheckCacheOnly", false, 0),
1151
1154
  IceInternal::Property("IceSSL.SchannelStrongCrypto", false, 0),
1152
1155
  IceInternal::Property("IceSSL.Trace.Security", false, 0),
1153
1156
  IceInternal::Property("IceSSL.TrustOnly", false, 0),
data/ext/ice/cpp/src/Ice/PropertyNames.h CHANGED
@@ -1,7 +1,7 @@
1
1
  //
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
- // Generated by makeprops.py from file ./config/PropertyNames.xml, Fri May 28 11:30:40 2021
4
+ // Generated by makeprops.py from file ..\config\PropertyNames.xml, Fri Jan 7 10:30:00 2022
5
5
 
6
6
  // IMPORTANT: Do not edit this file -- any edits made here will be lost!
7
7
 
data/ext/ice/cpp/src/Ice/RemoteLogger.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
44
+ # if ICE_INT_VERSION % 100 < 7
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
data/ext/ice/cpp/src/Ice/Router.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
6
6
  //
7
7
  // <auto-generated>
8
8
  //
@@ -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 < 6
43
+ # if ICE_INT_VERSION % 100 < 7
44
44
  # error Ice patch level mismatch!
45
45
  # endif
46
46
  #endif
data/ext/ice/cpp/src/Ice/RouterF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/RouterInfo.cpp CHANGED
@@ -25,8 +25,12 @@ void
25
25
  IceInternal::RouterManager::destroy()
26
26
  {
27
27
  IceUtil::Mutex::Lock sync(*this);
28
- #ifdef ICE_CPP11_MAPPING
29
- for_each(_table.begin(), _table.end(), [](const pair<shared_ptr<RouterPrx>, RouterInfoPtr> it){ it.second->destroy(); });
28
+ #ifdef ICE_CPP11_COMPILER
29
+ for_each(_table.begin(), _table.end(),
30
+ [](const pair<RouterPrxPtr, RouterInfoPtr> it)
31
+ {
32
+ it.second->destroy();
33
+ });
30
34
  #else
31
35
  for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const RouterPrx, RouterInfo>(&RouterInfo::destroy));
32
36
  #endif
data/ext/ice/cpp/src/Ice/SHA1.cpp CHANGED
@@ -12,6 +12,8 @@
12
12
  # include <CommonCrypto/CommonDigest.h>
13
13
  # else
14
14
  # include <openssl/sha.h>
15
+ # // Ignore OpenSSL 3.0 deprecation warning
16
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
15
17
  # endif
16
18
  #endif
17
19
 
data/ext/ice/cpp/src/Ice/ServantLocator.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
38
+ # if ICE_INT_VERSION % 100 < 7
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright (c) ZeroC, Inc. All rights reserved.
3
3
  //
4
4
  //
5
- // Ice version 3.7.6
5
+ // Ice version 3.7.7
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 < 6
40
+ # if ICE_INT_VERSION % 100 < 7
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif