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
data/ext/ice/cpp/src/Ice/EndpointTypes.cpp 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
  //
@@ -34,7 +34,7 @@
34
34
  # if ICE_INT_VERSION % 100 > 50
35
35
  # error Beta header file detected
36
36
  # endif
37
- # if ICE_INT_VERSION % 100 < 0
37
+ # if ICE_INT_VERSION % 100 < 1
38
38
  # error Ice patch level mismatch!
39
39
  # endif
40
40
  #endif
data/ext/ice/cpp/src/Ice/FacetMap.cpp 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
  //
@@ -34,7 +34,7 @@
34
34
  # if ICE_INT_VERSION % 100 > 50
35
35
  # error Beta header file detected
36
36
  # endif
37
- # if ICE_INT_VERSION % 100 < 0
37
+ # if ICE_INT_VERSION % 100 < 1
38
38
  # error Ice patch level mismatch!
39
39
  # endif
40
40
  #endif
data/ext/ice/cpp/src/Ice/HttpParser.cpp CHANGED
@@ -13,8 +13,6 @@
13
13
  #include <Ice/LocalException.h>
14
14
  #include <IceUtil/StringUtil.h>
15
15
 
16
- #include <IceUtil/DisableWarnings.h>
17
-
18
16
  using namespace std;
19
17
  using namespace Ice;
20
18
  using namespace IceInternal;
data/ext/ice/cpp/src/Ice/Identity.cpp 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
  //
@@ -34,7 +34,7 @@
34
34
  # if ICE_INT_VERSION % 100 > 50
35
35
  # error Beta header file detected
36
36
  # endif
37
- # if ICE_INT_VERSION % 100 < 0
37
+ # if ICE_INT_VERSION % 100 < 1
38
38
  # error Ice patch level mismatch!
39
39
  # endif
40
40
  #endif
data/ext/ice/cpp/src/Ice/ImplicitContext.cpp 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
  //
@@ -34,7 +34,7 @@
34
34
  # if ICE_INT_VERSION % 100 > 50
35
35
  # error Beta header file detected
36
36
  # endif
37
- # if ICE_INT_VERSION % 100 < 0
37
+ # if ICE_INT_VERSION % 100 < 1
38
38
  # error Ice patch level mismatch!
39
39
  # endif
40
40
  #endif
data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp 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
  //
@@ -33,7 +33,7 @@
33
33
  # if ICE_INT_VERSION % 100 > 50
34
34
  # error Beta header file detected
35
35
  # endif
36
- # if ICE_INT_VERSION % 100 < 0
36
+ # if ICE_INT_VERSION % 100 < 1
37
37
  # error Ice patch level mismatch!
38
38
  # endif
39
39
  #endif
data/ext/ice/cpp/src/Ice/Initialize.cpp CHANGED
@@ -7,7 +7,6 @@
7
7
  //
8
8
  // **********************************************************************
9
9
 
10
- #include <IceUtil/DisableWarnings.h>
11
10
  #include <IceUtil/ArgVector.h>
12
11
  #include <Ice/CommunicatorI.h>
13
12
  #include <Ice/PropertiesI.h>
@@ -41,6 +40,27 @@ makePair(const vector<Byte>& v)
41
40
  }
42
41
  }
43
42
 
43
+ IceUtil::Mutex* globalMutex = 0;
44
+ Ice::LoggerPtr processLogger;
45
+
46
+ class Init
47
+ {
48
+ public:
49
+
50
+ Init()
51
+ {
52
+ globalMutex = new IceUtil::Mutex;
53
+ }
54
+
55
+ ~Init()
56
+ {
57
+ delete globalMutex;
58
+ globalMutex = 0;
59
+ }
60
+ };
61
+
62
+ Init init;
63
+
44
64
  }
45
65
 
46
66
  StringSeq
@@ -304,36 +324,10 @@ Ice::createOutputStream(const CommunicatorPtr& communicator, const EncodingVersi
304
324
  return new OutputStreamI(communicator, v);
305
325
  }
306
326
 
307
- static IceUtil::Mutex* processLoggerMutex = 0;
308
- static Ice::LoggerPtr processLogger;
309
-
310
- namespace
311
- {
312
-
313
- class Init
314
- {
315
- public:
316
-
317
- Init()
318
- {
319
- processLoggerMutex = new IceUtil::Mutex;
320
- }
321
-
322
- ~Init()
323
- {
324
- delete processLoggerMutex;
325
- processLoggerMutex = 0;
326
- }
327
- };
328
-
329
- Init init;
330
-
331
- }
332
-
333
327
  LoggerPtr
334
328
  Ice::getProcessLogger()
335
329
  {
336
- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processLoggerMutex);
330
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
337
331
 
338
332
  if(processLogger == 0)
339
333
  {
@@ -348,13 +342,14 @@ Ice::getProcessLogger()
348
342
  void
349
343
  Ice::setProcessLogger(const LoggerPtr& logger)
350
344
  {
351
- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processLoggerMutex);
352
- processLogger = logger;
345
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
346
+ processLogger = logger;
353
347
  }
354
348
 
355
349
  void
356
350
  Ice::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool loadOnInitialize)
357
351
  {
352
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
358
353
  PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize);
359
354
  }
360
355
 
data/ext/ice/cpp/src/Ice/Instance.cpp CHANGED
@@ -7,8 +7,6 @@
7
7
  //
8
8
  // **********************************************************************
9
9
 
10
- #include <IceUtil/DisableWarnings.h>
11
-
12
10
  #include <Ice/Instance.h>
13
11
  #include <Ice/TraceLevels.h>
14
12
  #include <Ice/DefaultsAndOverrides.h>
@@ -42,7 +40,7 @@
42
40
  #include <Ice/InstrumentationI.h>
43
41
  #include <Ice/ProtocolInstance.h>
44
42
  #include <Ice/LoggerAdminI.h>
45
- #include <Ice/RegisterPlugins.h>
43
+ #include <Ice/RegisterPluginsInit.h>
46
44
  #include <Ice/ObserverHelper.h>
47
45
 
48
46
  #include <IceUtil/StringUtil.h>
data/ext/ice/cpp/src/Ice/Instrumentation.cpp 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
  //
@@ -34,7 +34,7 @@
34
34
  # if ICE_INT_VERSION % 100 > 50
35
35
  # error Beta header file detected
36
36
  # endif
37
- # if ICE_INT_VERSION % 100 < 0
37
+ # if ICE_INT_VERSION % 100 < 1
38
38
  # error Ice patch level mismatch!
39
39
  # endif
40
40
  #endif
data/ext/ice/cpp/src/Ice/InstrumentationF.cpp 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
  //
@@ -33,7 +33,7 @@
33
33
  # if ICE_INT_VERSION % 100 > 50
34
34
  # error Beta header file detected
35
35
  # endif
36
- # if ICE_INT_VERSION % 100 < 0
36
+ # if ICE_INT_VERSION % 100 < 1
37
37
  # error Ice patch level mismatch!
38
38
  # endif
39
39
  #endif
data/ext/ice/cpp/src/Ice/LocalException.cpp 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
  //
@@ -34,7 +34,7 @@
34
34
  # if ICE_INT_VERSION % 100 > 50
35
35
  # error Beta header file detected
36
36
  # endif
37
- # if ICE_INT_VERSION % 100 < 0
37
+ # if ICE_INT_VERSION % 100 < 1
38
38
  # error Ice patch level mismatch!
39
39
  # endif
40
40
  #endif
data/ext/ice/cpp/src/Ice/Locator.cpp 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/src/Ice/LocatorF.cpp 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
  //
@@ -34,7 +34,7 @@
34
34
  # if ICE_INT_VERSION % 100 > 50
35
35
  # error Beta header file detected
36
36
  # endif
37
- # if ICE_INT_VERSION % 100 < 0
37
+ # if ICE_INT_VERSION % 100 < 1
38
38
  # error Ice patch level mismatch!
39
39
  # endif
40
40
  #endif
data/ext/ice/cpp/src/Ice/LocatorInfo.cpp CHANGED
@@ -326,7 +326,7 @@ IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locato
326
326
  // by the locator is an indirect proxy. We now need to resolve the endpoints
327
327
  // of this indirect proxy.
328
328
  //
329
- locatorInfo->getEndpoints(r, _ref, _ttl, _callback);
329
+ locatorInfo->getEndpointsWithCallback(r, _ref, _ttl, _callback);
330
330
  return;
331
331
  }
332
332
  }
@@ -620,10 +620,10 @@ IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref, const ReferenceP
620
620
  }
621
621
 
622
622
  void
623
- IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref,
624
- const ReferencePtr& wellKnownRef,
625
- int ttl,
626
- const GetEndpointsCallbackPtr& callback)
623
+ IceInternal::LocatorInfo::getEndpointsWithCallback(const ReferencePtr& ref,
624
+ const ReferencePtr& wellKnownRef,
625
+ int ttl,
626
+ const GetEndpointsCallbackPtr& callback)
627
627
  {
628
628
  assert(ref->isIndirect());
629
629
  vector<EndpointIPtr> endpoints;
@@ -664,7 +664,7 @@ IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref,
664
664
  }
665
665
  else if(!r->isWellKnown())
666
666
  {
667
- getEndpoints(r, ref, ttl, callback);
667
+ getEndpointsWithCallback(r, ref, ttl, callback);
668
668
  return;
669
669
  }
670
670
  }
data/ext/ice/cpp/src/Ice/LocatorInfo.h CHANGED
@@ -58,7 +58,7 @@ public:
58
58
  LocatorTable();
59
59
 
60
60
  void clear();
61
-
61
+
62
62
  bool getAdapterEndpoints(const std::string&, int, ::std::vector<EndpointIPtr>&);
63
63
  void addAdapterEndpoints(const std::string&, const ::std::vector<EndpointIPtr>&);
64
64
  ::std::vector<EndpointIPtr> removeAdapterEndpoints(const std::string&);
@@ -66,7 +66,7 @@ public:
66
66
  bool getObjectReference(const Ice::Identity&, int, ReferencePtr&);
67
67
  void addObjectReference(const Ice::Identity&, const ReferencePtr&);
68
68
  ReferencePtr removeObjectReference(const Ice::Identity&);
69
-
69
+
70
70
  private:
71
71
 
72
72
  bool checkTTL(const IceUtil::Time&, int) const;
@@ -82,7 +82,7 @@ public:
82
82
  class GetEndpointsCallback : virtual public IceUtil::Shared
83
83
  {
84
84
  public:
85
-
85
+
86
86
  virtual void setEndpoints(const std::vector<EndpointIPtr>&, bool) = 0;
87
87
  virtual void setException(const Ice::LocalException&) = 0;
88
88
  };
@@ -111,7 +111,7 @@ public:
111
111
 
112
112
  void addCallback(const ReferencePtr&, const ReferencePtr&, int, const GetEndpointsCallbackPtr&);
113
113
  std::vector<EndpointIPtr> getEndpoints(const ReferencePtr&, const ReferencePtr&, int, bool&);
114
-
114
+
115
115
  void response(const Ice::ObjectPrx&);
116
116
  void exception(const Ice::Exception&);
117
117
 
@@ -157,12 +157,13 @@ public:
157
157
  {
158
158
  return getEndpoints(ref, 0, ttl, cached);
159
159
  }
160
- void getEndpoints(const ReferencePtr& ref, int ttl, const GetEndpointsCallbackPtr& cb)
160
+ std::vector<EndpointIPtr> getEndpoints(const ReferencePtr&, const ReferencePtr&, int, bool&);
161
+
162
+ void getEndpointsWithCallback(const ReferencePtr& ref, int ttl, const GetEndpointsCallbackPtr& cb)
161
163
  {
162
- getEndpoints(ref, 0, ttl, cb);
164
+ getEndpointsWithCallback(ref, 0, ttl, cb);
163
165
  }
164
- std::vector<EndpointIPtr> getEndpoints(const ReferencePtr&, const ReferencePtr&, int, bool&);
165
- void getEndpoints(const ReferencePtr&, const ReferencePtr&, int, const GetEndpointsCallbackPtr&);
166
+ void getEndpointsWithCallback(const ReferencePtr&, const ReferencePtr&, int, const GetEndpointsCallbackPtr&);
166
167
 
167
168
  void clearCache(const ReferencePtr&);
168
169
 
data/ext/ice/cpp/src/Ice/Logger.cpp 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
  //
@@ -33,7 +33,7 @@
33
33
  # if ICE_INT_VERSION % 100 > 50
34
34
  # error Beta header file detected
35
35
  # endif
36
- # if ICE_INT_VERSION % 100 < 0
36
+ # if ICE_INT_VERSION % 100 < 1
37
37
  # error Ice patch level mismatch!
38
38
  # endif
39
39
  #endif
data/ext/ice/cpp/src/Ice/LoggerF.cpp 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
  //
@@ -33,7 +33,7 @@
33
33
  # if ICE_INT_VERSION % 100 > 50
34
34
  # error Beta header file detected
35
35
  # endif
36
- # if ICE_INT_VERSION % 100 < 0
36
+ # if ICE_INT_VERSION % 100 < 1
37
37
  # error Ice patch level mismatch!
38
38
  # endif
39
39
  #endif
data/ext/ice/cpp/src/Ice/Metrics.cpp 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
@@ -1952,12 +1952,20 @@ IceMX::__patch(RemoteMetricsPtr& handle, const ::Ice::ObjectPtr& v)
1952
1952
  }
1953
1953
 
1954
1954
  ICE_API ::Ice::Object* IceMX::upCast(::IceMX::InvocationMetrics* p) { return p; }
1955
+
1956
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1957
+ # pragma warning(push)
1958
+ # pragma warning(disable:4589)
1959
+ #endif
1955
1960
  ::Ice::ObjectPtr
1956
1961
  IceMX::InvocationMetrics::ice_clone() const
1957
1962
  {
1958
1963
  ::Ice::Object* __p = new InvocationMetrics(*this);
1959
1964
  return __p;
1960
1965
  }
1966
+ #if defined(_MSC_VER) && (_MSC_VER >= 1900)
1967
+ # pragma warning(pop)
1968
+ #endif
1961
1969
 
1962
1970
  namespace
1963
1971
  {