zeroc-ice 3.7.5 → 3.7.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/Config.h +13 -0
- data/ext/Util.cpp +0 -4
- data/ext/ice/cpp/include/Ice/Exception.h +3 -3
- data/ext/ice/cpp/include/Ice/Functional.h +3 -1
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +1 -1
- data/ext/ice/cpp/include/Ice/Object.h +7 -0
- data/ext/ice/cpp/include/Ice/Proxy.h +25 -16
- data/ext/ice/cpp/include/Ice/Service.h +1 -1
- data/ext/ice/cpp/include/IceSSL/Plugin.h +142 -0
- data/ext/ice/cpp/include/IceUtil/Config.h +3 -2
- data/ext/ice/cpp/include/IceUtil/Functional.h +3 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Connection.h +45 -2
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Current.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +38 -2
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Identity.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +62 -2
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +464 -68
- data/ext/ice/cpp/include/generated/Ice/Locator.h +55 -7
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Logger.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +63 -11
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Process.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Properties.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +21 -3
- data/ext/ice/cpp/include/generated/Ice/Router.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/Version.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +7 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +7 -2
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Communicator.cpp +2 -2
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Connection.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Current.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +2 -2
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Identity.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/InputStream.cpp +10 -10
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +2 -2
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LocalException.cpp +398 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +32 -2
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Logger.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Metrics.cpp +8 -2
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +4 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +8 -8
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +5 -3
- data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +8 -2
- data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
- data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +6 -2
- data/ext/ice/cpp/src/Ice/SHA1.cpp +2 -0
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Thread.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +5 -1
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +2 -2
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +14 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +14 -2
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +23 -1
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +114 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +60 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +132 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +2 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +114 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.h +21 -0
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +142 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +117 -3
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +20 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +4 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +133 -2
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +150 -88
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +7 -2
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -0
- data/ext/ice/cpp/src/IceUtil/Time.cpp +2 -2
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +9 -5
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +8 -0
- data/ext/ice/cpp/src/Slice/MD5I.cpp +2 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +4 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +4 -0
- data/ext/ice/cpp/src/Slice/Parser.h +2 -2
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +40 -3
- data/ext/ice/cpp/src/Slice/Scanner.cpp +620 -368
- data/ext/ice/mcpp/CMakeLists.txt +80 -0
- data/ext/ice/mcpp/expand.c +6 -6
- data/ice.gemspec +1 -1
- data/lib/Glacier2/Metrics.rb +1 -1
- data/lib/Glacier2/PermissionsVerifier.rb +1 -1
- data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
- data/lib/Glacier2/Router.rb +1 -1
- data/lib/Glacier2/RouterF.rb +1 -1
- data/lib/Glacier2/SSLInfo.rb +1 -1
- data/lib/Glacier2/Session.rb +1 -1
- data/lib/Ice/BuiltinSequences.rb +1 -1
- data/lib/Ice/Communicator.rb +1 -1
- data/lib/Ice/CommunicatorF.rb +1 -1
- data/lib/Ice/Connection.rb +1 -1
- data/lib/Ice/ConnectionF.rb +1 -1
- data/lib/Ice/Current.rb +1 -1
- data/lib/Ice/Endpoint.rb +1 -1
- data/lib/Ice/EndpointF.rb +1 -1
- data/lib/Ice/EndpointTypes.rb +1 -1
- data/lib/Ice/FacetMap.rb +1 -1
- data/lib/Ice/Identity.rb +1 -1
- data/lib/Ice/ImplicitContext.rb +1 -1
- data/lib/Ice/ImplicitContextF.rb +1 -1
- data/lib/Ice/Instrumentation.rb +1 -1
- data/lib/Ice/InstrumentationF.rb +1 -1
- data/lib/Ice/LocalException.rb +1 -1
- data/lib/Ice/Locator.rb +1 -1
- data/lib/Ice/LocatorF.rb +1 -1
- data/lib/Ice/Logger.rb +1 -1
- data/lib/Ice/LoggerF.rb +1 -1
- data/lib/Ice/Metrics.rb +1 -1
- data/lib/Ice/ObjectAdapter.rb +1 -1
- data/lib/Ice/ObjectAdapterF.rb +1 -1
- data/lib/Ice/ObjectFactory.rb +1 -1
- data/lib/Ice/Plugin.rb +1 -1
- data/lib/Ice/PluginF.rb +1 -1
- data/lib/Ice/Process.rb +1 -1
- data/lib/Ice/ProcessF.rb +1 -1
- data/lib/Ice/Properties.rb +1 -1
- data/lib/Ice/PropertiesAdmin.rb +1 -1
- data/lib/Ice/PropertiesF.rb +1 -1
- data/lib/Ice/RemoteLogger.rb +1 -1
- data/lib/Ice/Router.rb +1 -1
- data/lib/Ice/RouterF.rb +1 -1
- data/lib/Ice/ServantLocator.rb +1 -1
- data/lib/Ice/ServantLocatorF.rb +1 -1
- data/lib/Ice/SliceChecksumDict.rb +1 -1
- data/lib/Ice/ValueFactory.rb +1 -1
- data/lib/Ice/Version.rb +1 -1
- data/lib/IceBox/IceBox.rb +1 -1
- data/lib/IceGrid/Admin.rb +1 -1
- data/lib/IceGrid/Descriptor.rb +1 -1
- data/lib/IceGrid/Exception.rb +1 -1
- data/lib/IceGrid/FileParser.rb +1 -1
- data/lib/IceGrid/PluginFacade.rb +1 -1
- data/lib/IceGrid/Registry.rb +1 -1
- data/lib/IceGrid/Session.rb +1 -1
- data/lib/IceGrid/UserAccountMapper.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +1 -1
- data/lib/IcePatch2/FileServer.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +1 -1
- data/lib/IceStorm/Metrics.rb +1 -1
- data/slice/Glacier2/PermissionsVerifier.ice +1 -0
- data/slice/Glacier2/PermissionsVerifierF.ice +1 -0
- data/slice/Glacier2/Router.ice +1 -0
- data/slice/Glacier2/RouterF.ice +1 -0
- data/slice/Glacier2/SSLInfo.ice +1 -0
- data/slice/Glacier2/Session.ice +1 -0
- data/slice/Ice/BuiltinSequences.ice +1 -0
- data/slice/Ice/Communicator.ice +1 -0
- data/slice/Ice/CommunicatorF.ice +1 -0
- data/slice/Ice/Connection.ice +1 -0
- data/slice/Ice/ConnectionF.ice +1 -0
- data/slice/Ice/Current.ice +1 -0
- data/slice/Ice/Endpoint.ice +1 -0
- data/slice/Ice/EndpointF.ice +1 -0
- data/slice/Ice/EndpointTypes.ice +1 -0
- data/slice/Ice/FacetMap.ice +1 -0
- data/slice/Ice/Identity.ice +1 -0
- data/slice/Ice/ImplicitContext.ice +1 -0
- data/slice/Ice/ImplicitContextF.ice +1 -0
- data/slice/Ice/Instrumentation.ice +1 -0
- data/slice/Ice/InstrumentationF.ice +1 -0
- data/slice/Ice/LocalException.ice +1 -0
- data/slice/Ice/Locator.ice +1 -0
- data/slice/Ice/LocatorF.ice +1 -0
- data/slice/Ice/Logger.ice +1 -0
- data/slice/Ice/LoggerF.ice +1 -0
- data/slice/Ice/Metrics.ice +1 -0
- data/slice/Ice/ObjectAdapter.ice +1 -0
- data/slice/Ice/ObjectAdapterF.ice +1 -0
- data/slice/Ice/ObjectFactory.ice +1 -0
- data/slice/Ice/Plugin.ice +1 -0
- data/slice/Ice/PluginF.ice +1 -0
- data/slice/Ice/Process.ice +1 -0
- data/slice/Ice/ProcessF.ice +1 -0
- data/slice/Ice/Properties.ice +1 -0
- data/slice/Ice/PropertiesAdmin.ice +1 -0
- data/slice/Ice/PropertiesF.ice +1 -0
- data/slice/Ice/RemoteLogger.ice +1 -0
- data/slice/Ice/Router.ice +1 -0
- data/slice/Ice/RouterF.ice +1 -0
- data/slice/Ice/ServantLocator.ice +1 -0
- data/slice/Ice/ServantLocatorF.ice +1 -0
- data/slice/Ice/SliceChecksumDict.ice +1 -0
- data/slice/Ice/ValueFactory.ice +1 -0
- data/slice/Ice/Version.ice +1 -0
- data/slice/IceBT/ConnectionInfo.ice +1 -0
- data/slice/IceBT/EndpointInfo.ice +1 -0
- data/slice/IceBT/Types.ice +1 -0
- data/slice/IceBox/IceBox.ice +1 -0
- data/slice/IceDiscovery/IceDiscovery.ice +1 -0
- data/slice/IceGrid/Admin.ice +1 -0
- data/slice/IceGrid/Descriptor.ice +1 -0
- data/slice/IceGrid/Exception.ice +1 -0
- data/slice/IceGrid/FileParser.ice +1 -0
- data/slice/IceGrid/PluginFacade.ice +1 -0
- data/slice/IceGrid/Registry.ice +1 -0
- data/slice/IceGrid/Session.ice +1 -0
- data/slice/IceGrid/UserAccountMapper.ice +1 -0
- data/slice/IceIAP/ConnectionInfo.ice +1 -0
- data/slice/IceIAP/EndpointInfo.ice +1 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +1 -0
- data/slice/IcePatch2/FileInfo.ice +1 -0
- data/slice/IcePatch2/FileServer.ice +1 -0
- data/slice/IceSSL/ConnectionInfo.ice +1 -0
- data/slice/IceSSL/ConnectionInfoF.ice +1 -0
- data/slice/IceSSL/EndpointInfo.ice +1 -0
- data/slice/IceStorm/IceStorm.ice +1 -0
- data/slice/IceStorm/Metrics.ice +4 -1
- metadata +4 -4
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
47
|
+
# if ICE_INT_VERSION % 100 < 8
|
48
48
|
# error Ice patch level mismatch!
|
49
49
|
# endif
|
50
50
|
#endif
|
@@ -954,7 +954,13 @@ class ICE_API RemoteLoggerAlreadyAttachedException : public UserException
|
|
954
954
|
public:
|
955
955
|
|
956
956
|
RemoteLoggerAlreadyAttachedException() {}
|
957
|
+
|
958
|
+
#ifdef ICE_CPP11_COMPILER
|
959
|
+
RemoteLoggerAlreadyAttachedException(const RemoteLoggerAlreadyAttachedException&) = default;
|
960
|
+
virtual ~RemoteLoggerAlreadyAttachedException();
|
961
|
+
#else
|
957
962
|
virtual ~RemoteLoggerAlreadyAttachedException() throw();
|
963
|
+
#endif
|
958
964
|
|
959
965
|
/**
|
960
966
|
* Obtains the Slice type ID of this exception.
|
@@ -962,7 +968,7 @@ public:
|
|
962
968
|
*/
|
963
969
|
virtual ::std::string ice_id() const;
|
964
970
|
/**
|
965
|
-
*
|
971
|
+
* Polymorphically clones this exception.
|
966
972
|
* @return A shallow copy of this exception.
|
967
973
|
*/
|
968
974
|
virtual RemoteLoggerAlreadyAttachedException* ice_clone() const;
|
@@ -1611,6 +1617,12 @@ public:
|
|
1611
1617
|
|
1612
1618
|
virtual ~RemoteLogger();
|
1613
1619
|
|
1620
|
+
#ifdef ICE_CPP11_COMPILER
|
1621
|
+
RemoteLogger() = default;
|
1622
|
+
RemoteLogger(const RemoteLogger&) = default;
|
1623
|
+
RemoteLogger& operator=(const RemoteLogger&) = default;
|
1624
|
+
#endif
|
1625
|
+
|
1614
1626
|
/**
|
1615
1627
|
* Determines whether this object supports an interface with the given Slice type ID.
|
1616
1628
|
* @param id The fully-scoped Slice type ID.
|
@@ -1698,6 +1710,12 @@ public:
|
|
1698
1710
|
|
1699
1711
|
virtual ~LoggerAdmin();
|
1700
1712
|
|
1713
|
+
#ifdef ICE_CPP11_COMPILER
|
1714
|
+
LoggerAdmin() = default;
|
1715
|
+
LoggerAdmin(const LoggerAdmin&) = default;
|
1716
|
+
LoggerAdmin& operator=(const LoggerAdmin&) = default;
|
1717
|
+
#endif
|
1718
|
+
|
1701
1719
|
/**
|
1702
1720
|
* Determines whether this object supports an interface with the given Slice type ID.
|
1703
1721
|
* @param id The fully-scoped Slice type ID.
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -42,7 +42,7 @@
|
|
42
42
|
# if ICE_INT_VERSION % 100 >= 50
|
43
43
|
# error Beta header file detected
|
44
44
|
# endif
|
45
|
-
# if ICE_INT_VERSION % 100 <
|
45
|
+
# if ICE_INT_VERSION % 100 < 8
|
46
46
|
# error Ice patch level mismatch!
|
47
47
|
# endif
|
48
48
|
#endif
|
@@ -1035,6 +1035,12 @@ public:
|
|
1035
1035
|
|
1036
1036
|
virtual ~Router();
|
1037
1037
|
|
1038
|
+
#ifdef ICE_CPP11_COMPILER
|
1039
|
+
Router() = default;
|
1040
|
+
Router(const Router&) = default;
|
1041
|
+
Router& operator=(const Router&) = default;
|
1042
|
+
#endif
|
1043
|
+
|
1038
1044
|
/**
|
1039
1045
|
* Determines whether this object supports an interface with the given Slice type ID.
|
1040
1046
|
* @param id The fully-scoped Slice type ID.
|
@@ -1145,6 +1151,12 @@ public:
|
|
1145
1151
|
|
1146
1152
|
virtual ~RouterFinder();
|
1147
1153
|
|
1154
|
+
#ifdef ICE_CPP11_COMPILER
|
1155
|
+
RouterFinder() = default;
|
1156
|
+
RouterFinder(const RouterFinder&) = default;
|
1157
|
+
RouterFinder& operator=(const RouterFinder&) = default;
|
1158
|
+
#endif
|
1159
|
+
|
1148
1160
|
/**
|
1149
1161
|
* Determines whether this object supports an interface with the given Slice type ID.
|
1150
1162
|
* @param id The fully-scoped Slice type ID.
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -36,7 +36,7 @@
|
|
36
36
|
# if ICE_INT_VERSION % 100 >= 50
|
37
37
|
# error Beta header file detected
|
38
38
|
# endif
|
39
|
-
# if ICE_INT_VERSION % 100 <
|
39
|
+
# if ICE_INT_VERSION % 100 < 8
|
40
40
|
# error Ice patch level mismatch!
|
41
41
|
# endif
|
42
42
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -200,6 +200,12 @@ public:
|
|
200
200
|
|
201
201
|
virtual ~ServantLocator();
|
202
202
|
|
203
|
+
#ifdef ICE_CPP11_COMPILER
|
204
|
+
ServantLocator() = default;
|
205
|
+
ServantLocator(const ServantLocator&) = default;
|
206
|
+
ServantLocator& operator=(const ServantLocator&) = default;
|
207
|
+
#endif
|
208
|
+
|
203
209
|
/**
|
204
210
|
* Called before a request is dispatched if a
|
205
211
|
* servant cannot be found in the object adapter's active servant
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -197,6 +197,12 @@ public:
|
|
197
197
|
|
198
198
|
virtual ~ValueFactory();
|
199
199
|
|
200
|
+
#ifdef ICE_CPP11_COMPILER
|
201
|
+
ValueFactory() = default;
|
202
|
+
ValueFactory(const ValueFactory&) = default;
|
203
|
+
ValueFactory& operator=(const ValueFactory&) = default;
|
204
|
+
#endif
|
205
|
+
|
200
206
|
/**
|
201
207
|
* Create a new value for a given value type. The type is the
|
202
208
|
* absolute Slice type id, i.e., the id relative to the
|
@@ -239,6 +245,12 @@ public:
|
|
239
245
|
|
240
246
|
virtual ~ValueFactoryManager();
|
241
247
|
|
248
|
+
#ifdef ICE_CPP11_COMPILER
|
249
|
+
ValueFactoryManager() = default;
|
250
|
+
ValueFactoryManager(const ValueFactoryManager&) = default;
|
251
|
+
ValueFactoryManager& operator=(const ValueFactoryManager&) = default;
|
252
|
+
#endif
|
253
|
+
|
242
254
|
/**
|
243
255
|
* Add a value factory. Attempting to add a factory with an id for
|
244
256
|
* which a factory is already registered throws AlreadyRegisteredException.
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
41
|
+
# if ICE_INT_VERSION % 100 < 8
|
42
42
|
# error Ice patch level mismatch!
|
43
43
|
# endif
|
44
44
|
#endif
|
@@ -182,6 +182,11 @@ public:
|
|
182
182
|
{
|
183
183
|
}
|
184
184
|
|
185
|
+
#ifdef ICE_CPP11_COMPILER
|
186
|
+
ConnectionInfo(const ConnectionInfo&) = default;
|
187
|
+
ConnectionInfo& operator=(const ConnectionInfo&) = default;
|
188
|
+
#endif
|
189
|
+
|
185
190
|
/**
|
186
191
|
* The negotiated cipher suite.
|
187
192
|
*/
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -36,7 +36,7 @@
|
|
36
36
|
# if ICE_INT_VERSION % 100 >= 50
|
37
37
|
# error Beta header file detected
|
38
38
|
# endif
|
39
|
-
# if ICE_INT_VERSION % 100 <
|
39
|
+
# if ICE_INT_VERSION % 100 < 8
|
40
40
|
# error Ice patch level mismatch!
|
41
41
|
# endif
|
42
42
|
#endif
|
@@ -152,6 +152,11 @@ public:
|
|
152
152
|
::Ice::EndpointInfo(underlying, timeout, compress)
|
153
153
|
{
|
154
154
|
}
|
155
|
+
|
156
|
+
#ifdef ICE_CPP11_COMPILER
|
157
|
+
EndpointInfo(const EndpointInfo&) = default;
|
158
|
+
EndpointInfo& operator=(const EndpointInfo&) = default;
|
159
|
+
#endif
|
155
160
|
};
|
156
161
|
|
157
162
|
/// \cond INTERNAL
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
44
|
+
# if ICE_INT_VERSION % 100 < 8
|
45
45
|
# error Ice patch level mismatch!
|
46
46
|
# endif
|
47
47
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -48,7 +48,7 @@ IceUtil::Shared* IceInternal::upCast(IncomingConnectionFactory* p) { return p; }
|
|
48
48
|
namespace
|
49
49
|
{
|
50
50
|
|
51
|
-
#ifdef
|
51
|
+
#ifdef ICE_CPP11_COMPILER
|
52
52
|
template <typename Map> void
|
53
53
|
remove(Map& m, const typename Map::key_type& k, const typename Map::mapped_type& v)
|
54
54
|
{
|
@@ -463,7 +463,7 @@ IceInternal::OutgoingConnectionFactory::findConnection(const vector<EndpointIPtr
|
|
463
463
|
assert(!endpoints.empty());
|
464
464
|
for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
|
465
465
|
{
|
466
|
-
#ifdef
|
466
|
+
#ifdef ICE_CPP11_COMPILER
|
467
467
|
auto connection = find(_connectionsByEndpoint, *p,
|
468
468
|
[](const ConnectionIPtr& conn)
|
469
469
|
{
|
@@ -501,7 +501,7 @@ IceInternal::OutgoingConnectionFactory::findConnection(const vector<ConnectorInf
|
|
501
501
|
continue;
|
502
502
|
}
|
503
503
|
|
504
|
-
#ifdef
|
504
|
+
#ifdef ICE_CPP11_COMPILER
|
505
505
|
auto connection = find(_connections, p->connector,
|
506
506
|
[](const ConnectionIPtr& conn)
|
507
507
|
{
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 8
|
41
41
|
# error Ice patch level mismatch!
|
42
42
|
# endif
|
43
43
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.8
|
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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -608,12 +608,12 @@ Ice::InputStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray
|
|
608
608
|
v.second = reinterpret_cast<Short*>(i);
|
609
609
|
#else
|
610
610
|
# ifdef ICE_CPP11_MAPPING
|
611
|
-
auto result = new short[sz];
|
611
|
+
auto result = new short[static_cast<size_t>(sz)];
|
612
612
|
_deleters.push_back([result] { delete[] result; });
|
613
613
|
v.first = result;
|
614
614
|
v.second = result + sz;
|
615
615
|
# else
|
616
|
-
result.reset(new Short[sz]);
|
616
|
+
result.reset(new Short[static_cast<size_t>(sz)]);
|
617
617
|
v.first = result.get();
|
618
618
|
v.second = result.get() + sz;
|
619
619
|
# endif
|
@@ -691,12 +691,12 @@ Ice::InputStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<I
|
|
691
691
|
#else
|
692
692
|
|
693
693
|
# ifdef ICE_CPP11_MAPPING
|
694
|
-
auto result = new int[sz];
|
694
|
+
auto result = new int[static_cast<size_t>(sz)];
|
695
695
|
_deleters.push_back([result] { delete[] result; });
|
696
696
|
v.first = result;
|
697
697
|
v.second = result + sz;
|
698
698
|
# else
|
699
|
-
result.reset(new Int[sz]);
|
699
|
+
result.reset(new Int[static_cast<size_t>(sz)]);
|
700
700
|
v.first = result.get();
|
701
701
|
v.second = result.get() + sz;
|
702
702
|
# endif
|
@@ -812,12 +812,12 @@ Ice::InputStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<L
|
|
812
812
|
#else
|
813
813
|
|
814
814
|
# ifdef ICE_CPP11_MAPPING
|
815
|
-
auto result = new long long[sz];
|
815
|
+
auto result = new long long[static_cast<size_t>(sz)];
|
816
816
|
_deleters.push_back([result] { delete[] result; });
|
817
817
|
v.first = result;
|
818
818
|
v.second = result + sz;
|
819
819
|
# else
|
820
|
-
result.reset(new Long[sz]);
|
820
|
+
result.reset(new Long[static_cast<size_t>(sz)]);
|
821
821
|
v.first = result.get();
|
822
822
|
v.second = result.get() + sz;
|
823
823
|
# endif
|
@@ -925,12 +925,12 @@ Ice::InputStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray
|
|
925
925
|
#else
|
926
926
|
|
927
927
|
# ifdef ICE_CPP11_MAPPING
|
928
|
-
auto result = new float[sz];
|
928
|
+
auto result = new float[static_cast<size_t>(sz)];
|
929
929
|
_deleters.push_back([result] { delete[] result; });
|
930
930
|
v.first = result;
|
931
931
|
v.second = result + sz;
|
932
932
|
# else
|
933
|
-
result.reset(new Float[sz]);
|
933
|
+
result.reset(new Float[static_cast<size_t>(sz)]);
|
934
934
|
v.first = result.get();
|
935
935
|
v.second = result.get() + sz;
|
936
936
|
# endif
|
@@ -1046,12 +1046,12 @@ Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArr
|
|
1046
1046
|
#else
|
1047
1047
|
|
1048
1048
|
# ifdef ICE_CPP11_MAPPING
|
1049
|
-
auto result = new double[sz];
|
1049
|
+
auto result = new double[static_cast<size_t>(sz)];
|
1050
1050
|
_deleters.push_back([result] { delete[] result; });
|
1051
1051
|
v.first = result;
|
1052
1052
|
v.second = result + sz;
|
1053
1053
|
# else
|
1054
|
-
result.reset(new Double[sz]);
|
1054
|
+
result.reset(new Double[static_cast<size_t>(sz)]);
|
1055
1055
|
v.first = result.get();
|
1056
1056
|
v.second = result.get() + sz;
|
1057
1057
|
# endif
|