zeroc-ice 3.7.5 → 3.7.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (179) hide show
  1. checksums.yaml +4 -4
  2. data/ext/Config.h +3 -0
  3. data/ext/ice/cpp/include/Ice/Exception.h +3 -3
  4. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +1 -1
  5. data/ext/ice/cpp/include/Ice/Object.h +5 -0
  6. data/ext/ice/cpp/include/Ice/Service.h +1 -1
  7. data/ext/ice/cpp/include/IceSSL/Plugin.h +58 -0
  8. data/ext/ice/cpp/include/IceUtil/Config.h +3 -2
  9. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
  10. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +2 -2
  11. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
  12. data/ext/ice/cpp/include/generated/Ice/Communicator.h +8 -2
  13. data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
  14. data/ext/ice/cpp/include/generated/Ice/Connection.h +45 -2
  15. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +2 -2
  16. data/ext/ice/cpp/include/generated/Ice/Current.h +2 -2
  17. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +38 -2
  18. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +2 -2
  19. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
  20. data/ext/ice/cpp/include/generated/Ice/FacetMap.h +2 -2
  21. data/ext/ice/cpp/include/generated/Ice/Identity.h +2 -2
  22. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +8 -2
  23. data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +2 -2
  24. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +62 -2
  25. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +2 -2
  26. data/ext/ice/cpp/include/generated/Ice/LocalException.h +464 -68
  27. data/ext/ice/cpp/include/generated/Ice/Locator.h +55 -7
  28. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +2 -2
  29. data/ext/ice/cpp/include/generated/Ice/Logger.h +8 -2
  30. data/ext/ice/cpp/include/generated/Ice/LoggerF.h +2 -2
  31. data/ext/ice/cpp/include/generated/Ice/Metrics.h +63 -11
  32. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +8 -2
  33. data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +2 -2
  34. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +8 -2
  35. data/ext/ice/cpp/include/generated/Ice/Plugin.h +14 -2
  36. data/ext/ice/cpp/include/generated/Ice/PluginF.h +2 -2
  37. data/ext/ice/cpp/include/generated/Ice/Process.h +8 -2
  38. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +2 -2
  39. data/ext/ice/cpp/include/generated/Ice/Properties.h +8 -2
  40. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -2
  41. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
  42. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +21 -3
  43. data/ext/ice/cpp/include/generated/Ice/Router.h +14 -2
  44. data/ext/ice/cpp/include/generated/Ice/RouterF.h +2 -2
  45. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +8 -2
  46. data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +2 -2
  47. data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
  48. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +14 -2
  49. data/ext/ice/cpp/include/generated/Ice/Version.h +2 -2
  50. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +7 -2
  51. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
  52. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +7 -2
  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/InputStream.cpp +10 -10
  67. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +2 -2
  68. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
  69. data/ext/ice/cpp/src/Ice/LocalException.cpp +398 -2
  70. data/ext/ice/cpp/src/Ice/Locator.cpp +32 -2
  71. data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
  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 +8 -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/ObjectFactory.cpp +2 -2
  78. data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
  79. data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
  80. data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
  81. data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
  82. data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
  83. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
  84. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
  85. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +1 -2
  86. data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
  87. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +8 -2
  88. data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
  89. data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
  90. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +2 -2
  91. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +2 -2
  92. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +2 -2
  93. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +2 -2
  94. data/ext/ice/cpp/src/Ice/Version.cpp +2 -2
  95. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +2 -2
  96. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +14 -2
  97. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
  98. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +14 -2
  99. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +2 -2
  100. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +2 -2
  101. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +2 -2
  102. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +4 -1
  103. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +104 -1
  104. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -0
  105. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +114 -0
  106. data/ext/ice/cpp/src/IceSSL/PluginI.h +10 -0
  107. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +101 -2
  108. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -0
  109. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +113 -72
  110. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -0
  111. data/ext/ice/cpp/src/IceUtil/Time.cpp +2 -2
  112. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +6 -2
  113. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +8 -0
  114. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +4 -0
  115. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +4 -0
  116. data/ext/ice/cpp/src/Slice/Scanner.cpp +620 -368
  117. data/ext/ice/mcpp/CMakeLists.txt +80 -0
  118. data/ext/ice/mcpp/expand.c +6 -6
  119. data/ice.gemspec +1 -1
  120. data/lib/Glacier2/Metrics.rb +1 -1
  121. data/lib/Glacier2/PermissionsVerifier.rb +1 -1
  122. data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
  123. data/lib/Glacier2/Router.rb +1 -1
  124. data/lib/Glacier2/RouterF.rb +1 -1
  125. data/lib/Glacier2/SSLInfo.rb +1 -1
  126. data/lib/Glacier2/Session.rb +1 -1
  127. data/lib/Ice/BuiltinSequences.rb +1 -1
  128. data/lib/Ice/Communicator.rb +1 -1
  129. data/lib/Ice/CommunicatorF.rb +1 -1
  130. data/lib/Ice/Connection.rb +1 -1
  131. data/lib/Ice/ConnectionF.rb +1 -1
  132. data/lib/Ice/Current.rb +1 -1
  133. data/lib/Ice/Endpoint.rb +1 -1
  134. data/lib/Ice/EndpointF.rb +1 -1
  135. data/lib/Ice/EndpointTypes.rb +1 -1
  136. data/lib/Ice/FacetMap.rb +1 -1
  137. data/lib/Ice/Identity.rb +1 -1
  138. data/lib/Ice/ImplicitContext.rb +1 -1
  139. data/lib/Ice/ImplicitContextF.rb +1 -1
  140. data/lib/Ice/Instrumentation.rb +1 -1
  141. data/lib/Ice/InstrumentationF.rb +1 -1
  142. data/lib/Ice/LocalException.rb +1 -1
  143. data/lib/Ice/Locator.rb +1 -1
  144. data/lib/Ice/LocatorF.rb +1 -1
  145. data/lib/Ice/Logger.rb +1 -1
  146. data/lib/Ice/LoggerF.rb +1 -1
  147. data/lib/Ice/Metrics.rb +1 -1
  148. data/lib/Ice/ObjectAdapter.rb +1 -1
  149. data/lib/Ice/ObjectAdapterF.rb +1 -1
  150. data/lib/Ice/ObjectFactory.rb +1 -1
  151. data/lib/Ice/Plugin.rb +1 -1
  152. data/lib/Ice/PluginF.rb +1 -1
  153. data/lib/Ice/Process.rb +1 -1
  154. data/lib/Ice/ProcessF.rb +1 -1
  155. data/lib/Ice/Properties.rb +1 -1
  156. data/lib/Ice/PropertiesAdmin.rb +1 -1
  157. data/lib/Ice/PropertiesF.rb +1 -1
  158. data/lib/Ice/RemoteLogger.rb +1 -1
  159. data/lib/Ice/Router.rb +1 -1
  160. data/lib/Ice/RouterF.rb +1 -1
  161. data/lib/Ice/ServantLocator.rb +1 -1
  162. data/lib/Ice/ServantLocatorF.rb +1 -1
  163. data/lib/Ice/SliceChecksumDict.rb +1 -1
  164. data/lib/Ice/ValueFactory.rb +1 -1
  165. data/lib/Ice/Version.rb +1 -1
  166. data/lib/IceBox/IceBox.rb +1 -1
  167. data/lib/IceGrid/Admin.rb +1 -1
  168. data/lib/IceGrid/Descriptor.rb +1 -1
  169. data/lib/IceGrid/Exception.rb +1 -1
  170. data/lib/IceGrid/FileParser.rb +1 -1
  171. data/lib/IceGrid/PluginFacade.rb +1 -1
  172. data/lib/IceGrid/Registry.rb +1 -1
  173. data/lib/IceGrid/Session.rb +1 -1
  174. data/lib/IceGrid/UserAccountMapper.rb +1 -1
  175. data/lib/IcePatch2/FileInfo.rb +1 -1
  176. data/lib/IcePatch2/FileServer.rb +1 -1
  177. data/lib/IceStorm/IceStorm.rb +1 -1
  178. data/lib/IceStorm/Metrics.rb +1 -1
  179. metadata +4 -4
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.5
5
+ // Ice version 3.7.6
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 < 5
44
+ # if ICE_INT_VERSION % 100 < 6
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
@@ -745,9 +745,15 @@ const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::AdapterNotFoundExce
745
745
 
746
746
  }
747
747
 
748
+ #ifdef ICE_CPP11_COMPILER
749
+ Ice::AdapterNotFoundException::~AdapterNotFoundException()
750
+ {
751
+ }
752
+ #else
748
753
  Ice::AdapterNotFoundException::~AdapterNotFoundException() throw()
749
754
  {
750
755
  }
756
+ #endif
751
757
 
752
758
  ::std::string
753
759
  Ice::AdapterNotFoundException::ice_id() const
@@ -792,9 +798,15 @@ const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::InvalidReplicaGroup
792
798
 
793
799
  }
794
800
 
801
+ #ifdef ICE_CPP11_COMPILER
802
+ Ice::InvalidReplicaGroupIdException::~InvalidReplicaGroupIdException()
803
+ {
804
+ }
805
+ #else
795
806
  Ice::InvalidReplicaGroupIdException::~InvalidReplicaGroupIdException() throw()
796
807
  {
797
808
  }
809
+ #endif
798
810
 
799
811
  ::std::string
800
812
  Ice::InvalidReplicaGroupIdException::ice_id() const
@@ -839,9 +851,15 @@ const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::AdapterAlreadyActiv
839
851
 
840
852
  }
841
853
 
854
+ #ifdef ICE_CPP11_COMPILER
855
+ Ice::AdapterAlreadyActiveException::~AdapterAlreadyActiveException()
856
+ {
857
+ }
858
+ #else
842
859
  Ice::AdapterAlreadyActiveException::~AdapterAlreadyActiveException() throw()
843
860
  {
844
861
  }
862
+ #endif
845
863
 
846
864
  ::std::string
847
865
  Ice::AdapterAlreadyActiveException::ice_id() const
@@ -886,9 +904,15 @@ const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::ObjectNotFoundExcep
886
904
 
887
905
  }
888
906
 
907
+ #ifdef ICE_CPP11_COMPILER
908
+ Ice::ObjectNotFoundException::~ObjectNotFoundException()
909
+ {
910
+ }
911
+ #else
889
912
  Ice::ObjectNotFoundException::~ObjectNotFoundException() throw()
890
913
  {
891
914
  }
915
+ #endif
892
916
 
893
917
  ::std::string
894
918
  Ice::ObjectNotFoundException::ice_id() const
@@ -933,9 +957,15 @@ const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::ServerNotFoundExcep
933
957
 
934
958
  }
935
959
 
960
+ #ifdef ICE_CPP11_COMPILER
961
+ Ice::ServerNotFoundException::~ServerNotFoundException()
962
+ {
963
+ }
964
+ #else
936
965
  Ice::ServerNotFoundException::~ServerNotFoundException() throw()
937
966
  {
938
967
  }
968
+ #endif
939
969
 
940
970
  ::std::string
941
971
  Ice::ServerNotFoundException::ice_id() const
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.5
5
+ // Ice version 3.7.6
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 < 5
40
+ # if ICE_INT_VERSION % 100 < 6
41
41
  # error Ice patch level mismatch!
42
42
  # endif
43
43
  #endif
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.5
5
+ // Ice version 3.7.6
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 < 5
38
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
38
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
44
+ # if ICE_INT_VERSION % 100 < 6
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
@@ -591,9 +591,15 @@ const ::IceInternal::DefaultUserExceptionFactoryInit< ::IceMX::UnknownMetricsVie
591
591
 
592
592
  }
593
593
 
594
+ #ifdef ICE_CPP11_COMPILER
595
+ IceMX::UnknownMetricsView::~UnknownMetricsView()
596
+ {
597
+ }
598
+ #else
594
599
  IceMX::UnknownMetricsView::~UnknownMetricsView() throw()
595
600
  {
596
601
  }
602
+ #endif
597
603
 
598
604
  ::std::string
599
605
  IceMX::UnknownMetricsView::ice_id() const
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.5
5
+ // Ice version 3.7.6
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 < 5
44
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
38
+ # if ICE_INT_VERSION % 100 < 6
39
39
  # error Ice patch level mismatch!
40
40
  # endif
41
41
  #endif
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.5
5
+ // Ice version 3.7.6
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 < 5
40
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
40
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
38
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
43
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
40
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
43
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
43
+ # if ICE_INT_VERSION % 100 < 6
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.5
5
+ // Ice version 3.7.6
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 < 5
40
+ # if ICE_INT_VERSION % 100 < 6
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, Thu Jul 2 14:55:02 2020
4
+ // Generated by makeprops.py from file ./config/PropertyNames.xml, Fri May 28 11:30:40 2021
5
5
 
6
6
  // IMPORTANT: Do not edit this file -- any edits made here will be lost!
7
7
 
@@ -188,7 +188,6 @@ const IceInternal::Property IcePropsData[] =
188
188
  IceInternal::Property("Ice.Warn.UnusedProperties", false, 0),
189
189
  IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
190
190
  IceInternal::Property("Ice.ThreadInterruptSafe", false, 0),
191
- IceInternal::Property("Ice.Voip", true, 0),
192
191
  };
193
192
 
194
193
  const IceInternal::PropertyArray
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, Thu Jul 2 14:55:02 2020
4
+ // Generated by makeprops.py from file ./config/PropertyNames.xml, Fri May 28 11:30:40 2021
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.5
5
+ // Ice version 3.7.6
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 < 5
44
+ # if ICE_INT_VERSION % 100 < 6
45
45
  # error Ice patch level mismatch!
46
46
  # endif
47
47
  #endif
@@ -475,9 +475,15 @@ const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::RemoteLoggerAlready
475
475
 
476
476
  }
477
477
 
478
+ #ifdef ICE_CPP11_COMPILER
479
+ Ice::RemoteLoggerAlreadyAttachedException::~RemoteLoggerAlreadyAttachedException()
480
+ {
481
+ }
482
+ #else
478
483
  Ice::RemoteLoggerAlreadyAttachedException::~RemoteLoggerAlreadyAttachedException() throw()
479
484
  {
480
485
  }
486
+ #endif
481
487
 
482
488
  ::std::string
483
489
  Ice::RemoteLoggerAlreadyAttachedException::ice_id() const
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.5
5
+ // Ice version 3.7.6
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 < 5
43
+ # if ICE_INT_VERSION % 100 < 6
44
44
  # error Ice patch level mismatch!
45
45
  # endif
46
46
  #endif