zeroc-ice 3.7.3 → 3.7.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/Communicator.cpp +3 -0
- data/ext/Config.h +11 -0
- data/ext/Types.cpp +18 -2
- data/ext/Util.cpp +15 -3
- data/ext/Util.h +36 -0
- 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/Initialize.h +1 -1
- data/ext/ice/cpp/include/Ice/Object.h +7 -0
- data/ext/ice/cpp/include/Ice/Optional.h +1 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -0
- data/ext/ice/cpp/include/Ice/Proxy.h +56 -25
- 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 +10 -4
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Connection.h +58 -15
- 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 +50 -14
- 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 +523 -127
- data/ext/ice/cpp/include/generated/Ice/Locator.h +62 -14
- 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 +79 -27
- 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 +10 -4
- 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 +11 -5
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +26 -8
- data/ext/ice/cpp/include/generated/Ice/Router.h +18 -6
- 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 +10 -5
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +8 -3
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
- 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/ImplicitContextI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -1
- data/ext/ice/cpp/src/Ice/InputStream.cpp +29 -14
- data/ext/ice/cpp/src/Ice/Instance.cpp +3 -0
- data/ext/ice/cpp/src/Ice/Instance.h +2 -0
- 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/Network.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.h +0 -0
- 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 +6 -3
- data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +9 -0
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +8 -2
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +5 -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/StreamSocket.cpp +0 -0
- 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/ThreadPool.h +0 -4
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +0 -0
- 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 +491 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +16 -4
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +12 -1
- 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 +124 -19
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +60 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +105 -2
- 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 +151 -89
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +0 -0
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -0
- data/ext/ice/cpp/src/IceUtil/Time.cpp +8 -10
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +6 -2
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +12 -4
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +4 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +11 -7
- data/ext/ice/cpp/src/Slice/Parser.h +2 -2
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +12 -0
- data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -1
- data/ext/ice/cpp/src/Slice/Python.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +17 -5
- data/ext/ice/cpp/src/Slice/Scanner.cpp +621 -369
- 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/Ice/Communicator.ice +1 -1
- data/slice/IceBox/IceBox.ice +17 -2
- data/slice/IceDiscovery/IceDiscovery.ice +56 -0
- 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.7
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -45,7 +45,7 @@
|
|
45
45
|
# if ICE_INT_VERSION % 100 >= 50
|
46
46
|
# error Beta header file detected
|
47
47
|
# endif
|
48
|
-
# if ICE_INT_VERSION % 100 <
|
48
|
+
# if ICE_INT_VERSION % 100 < 7
|
49
49
|
# error Ice patch level mismatch!
|
50
50
|
# endif
|
51
51
|
#endif
|
@@ -565,7 +565,7 @@ public:
|
|
565
565
|
::std::function<void(bool)> sent = nullptr,
|
566
566
|
const Context& context = noExplicitContext)
|
567
567
|
{
|
568
|
-
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_findObjectById, id, context);
|
568
|
+
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LocatorPrx::_iceI_findObjectById, id, context);
|
569
569
|
}
|
570
570
|
|
571
571
|
/// \cond INTERNAL
|
@@ -617,7 +617,7 @@ public:
|
|
617
617
|
::std::function<void(bool)> sent = nullptr,
|
618
618
|
const Context& context = noExplicitContext)
|
619
619
|
{
|
620
|
-
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_findAdapterById, id, context);
|
620
|
+
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LocatorPrx::_iceI_findAdapterById, id, context);
|
621
621
|
}
|
622
622
|
|
623
623
|
/// \cond INTERNAL
|
@@ -660,7 +660,7 @@ public:
|
|
660
660
|
::std::function<void(bool)> sent = nullptr,
|
661
661
|
const Context& context = noExplicitContext)
|
662
662
|
{
|
663
|
-
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::LocatorRegistryPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_getRegistry, context);
|
663
|
+
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::LocatorRegistryPrx>>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LocatorPrx::_iceI_getRegistry, context);
|
664
664
|
}
|
665
665
|
|
666
666
|
/// \cond INTERNAL
|
@@ -751,7 +751,7 @@ public:
|
|
751
751
|
::std::function<void(bool)> sent = nullptr,
|
752
752
|
const Context& context = noExplicitContext)
|
753
753
|
{
|
754
|
-
return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LocatorRegistryPrx::_iceI_setAdapterDirectProxy, id, proxy, context);
|
754
|
+
return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LocatorRegistryPrx::_iceI_setAdapterDirectProxy, id, proxy, context);
|
755
755
|
}
|
756
756
|
|
757
757
|
/// \cond INTERNAL
|
@@ -818,7 +818,7 @@ public:
|
|
818
818
|
::std::function<void(bool)> sent = nullptr,
|
819
819
|
const Context& context = noExplicitContext)
|
820
820
|
{
|
821
|
-
return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LocatorRegistryPrx::_iceI_setReplicatedAdapterDirectProxy, adapterId, replicaGroupId, p, context);
|
821
|
+
return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LocatorRegistryPrx::_iceI_setReplicatedAdapterDirectProxy, adapterId, replicaGroupId, p, context);
|
822
822
|
}
|
823
823
|
|
824
824
|
/// \cond INTERNAL
|
@@ -869,7 +869,7 @@ public:
|
|
869
869
|
::std::function<void(bool)> sent = nullptr,
|
870
870
|
const Context& context = noExplicitContext)
|
871
871
|
{
|
872
|
-
return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LocatorRegistryPrx::_iceI_setServerProcessProxy, id, proxy, context);
|
872
|
+
return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LocatorRegistryPrx::_iceI_setServerProcessProxy, id, proxy, context);
|
873
873
|
}
|
874
874
|
|
875
875
|
/// \cond INTERNAL
|
@@ -943,7 +943,7 @@ public:
|
|
943
943
|
::std::function<void(bool)> sent = nullptr,
|
944
944
|
const Context& context = noExplicitContext)
|
945
945
|
{
|
946
|
-
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::LocatorPrx>>(response, ex, sent, this, &Ice::LocatorFinderPrx::_iceI_getLocator, context);
|
946
|
+
return _makeLamdaOutgoing<::std::shared_ptr<::Ice::LocatorPrx>>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LocatorFinderPrx::_iceI_getLocator, context);
|
947
947
|
}
|
948
948
|
|
949
949
|
/// \cond INTERNAL
|
@@ -1071,7 +1071,13 @@ class ICE_API AdapterNotFoundException : public UserException
|
|
1071
1071
|
public:
|
1072
1072
|
|
1073
1073
|
AdapterNotFoundException() {}
|
1074
|
+
|
1075
|
+
#ifdef ICE_CPP11_COMPILER
|
1076
|
+
AdapterNotFoundException(const AdapterNotFoundException&) = default;
|
1077
|
+
virtual ~AdapterNotFoundException();
|
1078
|
+
#else
|
1074
1079
|
virtual ~AdapterNotFoundException() throw();
|
1080
|
+
#endif
|
1075
1081
|
|
1076
1082
|
/**
|
1077
1083
|
* Obtains the Slice type ID of this exception.
|
@@ -1079,7 +1085,7 @@ public:
|
|
1079
1085
|
*/
|
1080
1086
|
virtual ::std::string ice_id() const;
|
1081
1087
|
/**
|
1082
|
-
*
|
1088
|
+
* Polymorphically clones this exception.
|
1083
1089
|
* @return A shallow copy of this exception.
|
1084
1090
|
*/
|
1085
1091
|
virtual AdapterNotFoundException* ice_clone() const;
|
@@ -1110,7 +1116,13 @@ class ICE_API InvalidReplicaGroupIdException : public UserException
|
|
1110
1116
|
public:
|
1111
1117
|
|
1112
1118
|
InvalidReplicaGroupIdException() {}
|
1119
|
+
|
1120
|
+
#ifdef ICE_CPP11_COMPILER
|
1121
|
+
InvalidReplicaGroupIdException(const InvalidReplicaGroupIdException&) = default;
|
1122
|
+
virtual ~InvalidReplicaGroupIdException();
|
1123
|
+
#else
|
1113
1124
|
virtual ~InvalidReplicaGroupIdException() throw();
|
1125
|
+
#endif
|
1114
1126
|
|
1115
1127
|
/**
|
1116
1128
|
* Obtains the Slice type ID of this exception.
|
@@ -1118,7 +1130,7 @@ public:
|
|
1118
1130
|
*/
|
1119
1131
|
virtual ::std::string ice_id() const;
|
1120
1132
|
/**
|
1121
|
-
*
|
1133
|
+
* Polymorphically clones this exception.
|
1122
1134
|
* @return A shallow copy of this exception.
|
1123
1135
|
*/
|
1124
1136
|
virtual InvalidReplicaGroupIdException* ice_clone() const;
|
@@ -1145,7 +1157,13 @@ class ICE_API AdapterAlreadyActiveException : public UserException
|
|
1145
1157
|
public:
|
1146
1158
|
|
1147
1159
|
AdapterAlreadyActiveException() {}
|
1160
|
+
|
1161
|
+
#ifdef ICE_CPP11_COMPILER
|
1162
|
+
AdapterAlreadyActiveException(const AdapterAlreadyActiveException&) = default;
|
1163
|
+
virtual ~AdapterAlreadyActiveException();
|
1164
|
+
#else
|
1148
1165
|
virtual ~AdapterAlreadyActiveException() throw();
|
1166
|
+
#endif
|
1149
1167
|
|
1150
1168
|
/**
|
1151
1169
|
* Obtains the Slice type ID of this exception.
|
@@ -1153,7 +1171,7 @@ public:
|
|
1153
1171
|
*/
|
1154
1172
|
virtual ::std::string ice_id() const;
|
1155
1173
|
/**
|
1156
|
-
*
|
1174
|
+
* Polymorphically clones this exception.
|
1157
1175
|
* @return A shallow copy of this exception.
|
1158
1176
|
*/
|
1159
1177
|
virtual AdapterAlreadyActiveException* ice_clone() const;
|
@@ -1179,7 +1197,13 @@ class ICE_API ObjectNotFoundException : public UserException
|
|
1179
1197
|
public:
|
1180
1198
|
|
1181
1199
|
ObjectNotFoundException() {}
|
1200
|
+
|
1201
|
+
#ifdef ICE_CPP11_COMPILER
|
1202
|
+
ObjectNotFoundException(const ObjectNotFoundException&) = default;
|
1203
|
+
virtual ~ObjectNotFoundException();
|
1204
|
+
#else
|
1182
1205
|
virtual ~ObjectNotFoundException() throw();
|
1206
|
+
#endif
|
1183
1207
|
|
1184
1208
|
/**
|
1185
1209
|
* Obtains the Slice type ID of this exception.
|
@@ -1187,7 +1211,7 @@ public:
|
|
1187
1211
|
*/
|
1188
1212
|
virtual ::std::string ice_id() const;
|
1189
1213
|
/**
|
1190
|
-
*
|
1214
|
+
* Polymorphically clones this exception.
|
1191
1215
|
* @return A shallow copy of this exception.
|
1192
1216
|
*/
|
1193
1217
|
virtual ObjectNotFoundException* ice_clone() const;
|
@@ -1213,7 +1237,13 @@ class ICE_API ServerNotFoundException : public UserException
|
|
1213
1237
|
public:
|
1214
1238
|
|
1215
1239
|
ServerNotFoundException() {}
|
1240
|
+
|
1241
|
+
#ifdef ICE_CPP11_COMPILER
|
1242
|
+
ServerNotFoundException(const ServerNotFoundException&) = default;
|
1243
|
+
virtual ~ServerNotFoundException();
|
1244
|
+
#else
|
1216
1245
|
virtual ~ServerNotFoundException() throw();
|
1246
|
+
#endif
|
1217
1247
|
|
1218
1248
|
/**
|
1219
1249
|
* Obtains the Slice type ID of this exception.
|
@@ -1221,7 +1251,7 @@ public:
|
|
1221
1251
|
*/
|
1222
1252
|
virtual ::std::string ice_id() const;
|
1223
1253
|
/**
|
1224
|
-
*
|
1254
|
+
* Polymorphically clones this exception.
|
1225
1255
|
* @return A shallow copy of this exception.
|
1226
1256
|
*/
|
1227
1257
|
virtual ServerNotFoundException* ice_clone() const;
|
@@ -2280,6 +2310,12 @@ public:
|
|
2280
2310
|
|
2281
2311
|
virtual ~Locator();
|
2282
2312
|
|
2313
|
+
#ifdef ICE_CPP11_COMPILER
|
2314
|
+
Locator() = default;
|
2315
|
+
Locator(const Locator&) = default;
|
2316
|
+
Locator& operator=(const Locator&) = default;
|
2317
|
+
#endif
|
2318
|
+
|
2283
2319
|
/**
|
2284
2320
|
* Determines whether this object supports an interface with the given Slice type ID.
|
2285
2321
|
* @param id The fully-scoped Slice type ID.
|
@@ -2390,6 +2426,12 @@ public:
|
|
2390
2426
|
|
2391
2427
|
virtual ~LocatorRegistry();
|
2392
2428
|
|
2429
|
+
#ifdef ICE_CPP11_COMPILER
|
2430
|
+
LocatorRegistry() = default;
|
2431
|
+
LocatorRegistry(const LocatorRegistry&) = default;
|
2432
|
+
LocatorRegistry& operator=(const LocatorRegistry&) = default;
|
2433
|
+
#endif
|
2434
|
+
|
2393
2435
|
/**
|
2394
2436
|
* Determines whether this object supports an interface with the given Slice type ID.
|
2395
2437
|
* @param id The fully-scoped Slice type ID.
|
@@ -2517,6 +2559,12 @@ public:
|
|
2517
2559
|
|
2518
2560
|
virtual ~LocatorFinder();
|
2519
2561
|
|
2562
|
+
#ifdef ICE_CPP11_COMPILER
|
2563
|
+
LocatorFinder() = default;
|
2564
|
+
LocatorFinder(const LocatorFinder&) = default;
|
2565
|
+
LocatorFinder& operator=(const LocatorFinder&) = default;
|
2566
|
+
#endif
|
2567
|
+
|
2520
2568
|
/**
|
2521
2569
|
* Determines whether this object supports an interface with the given Slice type ID.
|
2522
2570
|
* @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.7
|
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 < 7
|
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.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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 7
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -162,6 +162,12 @@ public:
|
|
162
162
|
|
163
163
|
virtual ~Logger();
|
164
164
|
|
165
|
+
#ifdef ICE_CPP11_COMPILER
|
166
|
+
Logger() = default;
|
167
|
+
Logger(const Logger&) = default;
|
168
|
+
Logger& operator=(const Logger&) = default;
|
169
|
+
#endif
|
170
|
+
|
165
171
|
/**
|
166
172
|
* Print a message. The message is printed literally, without
|
167
173
|
* any decorations such as executable name or time stamp.
|
@@ -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.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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 7
|
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.7
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -43,7 +43,7 @@
|
|
43
43
|
# if ICE_INT_VERSION % 100 >= 50
|
44
44
|
# error Beta header file detected
|
45
45
|
# endif
|
46
|
-
# if ICE_INT_VERSION % 100 <
|
46
|
+
# if ICE_INT_VERSION % 100 < 7
|
47
47
|
# error Ice patch level mismatch!
|
48
48
|
# endif
|
49
49
|
#endif
|
@@ -359,7 +359,7 @@ public:
|
|
359
359
|
* @param failures The number of failures observed.
|
360
360
|
*/
|
361
361
|
Metrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures) :
|
362
|
-
id(
|
362
|
+
id(id),
|
363
363
|
total(total),
|
364
364
|
current(current),
|
365
365
|
totalLifetime(totalLifetime),
|
@@ -442,7 +442,7 @@ public:
|
|
442
442
|
* @param inUseForOther The number of threads which are currently performing other activities.
|
443
443
|
*/
|
444
444
|
ThreadMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, int inUseForIO, int inUseForUser, int inUseForOther) :
|
445
|
-
Ice::ValueHelper<ThreadMetrics, Metrics>(
|
445
|
+
Ice::ValueHelper<ThreadMetrics, Metrics>(id, total, current, totalLifetime, failures),
|
446
446
|
inUseForIO(inUseForIO),
|
447
447
|
inUseForUser(inUseForUser),
|
448
448
|
inUseForOther(inUseForOther)
|
@@ -512,7 +512,7 @@ public:
|
|
512
512
|
* @param replySize The size of the dispatch reply.
|
513
513
|
*/
|
514
514
|
DispatchMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, int userException, long long int size, long long int replySize) :
|
515
|
-
Ice::ValueHelper<DispatchMetrics, Metrics>(
|
515
|
+
Ice::ValueHelper<DispatchMetrics, Metrics>(id, total, current, totalLifetime, failures),
|
516
516
|
userException(userException),
|
517
517
|
size(size),
|
518
518
|
replySize(replySize)
|
@@ -582,7 +582,7 @@ public:
|
|
582
582
|
* @param replySize The size of the invocation reply.
|
583
583
|
*/
|
584
584
|
ChildInvocationMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int size, long long int replySize) :
|
585
|
-
Ice::ValueHelper<ChildInvocationMetrics, Metrics>(
|
585
|
+
Ice::ValueHelper<ChildInvocationMetrics, Metrics>(id, total, current, totalLifetime, failures),
|
586
586
|
size(size),
|
587
587
|
replySize(replySize)
|
588
588
|
{
|
@@ -644,7 +644,7 @@ public:
|
|
644
644
|
* @param replySize The size of the invocation reply.
|
645
645
|
*/
|
646
646
|
CollocatedMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int size, long long int replySize) :
|
647
|
-
Ice::ValueHelper<CollocatedMetrics, ChildInvocationMetrics>(
|
647
|
+
Ice::ValueHelper<CollocatedMetrics, ChildInvocationMetrics>(id, total, current, totalLifetime, failures, size, replySize)
|
648
648
|
{
|
649
649
|
}
|
650
650
|
|
@@ -693,7 +693,7 @@ public:
|
|
693
693
|
* @param replySize The size of the invocation reply.
|
694
694
|
*/
|
695
695
|
RemoteMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int size, long long int replySize) :
|
696
|
-
Ice::ValueHelper<RemoteMetrics, ChildInvocationMetrics>(
|
696
|
+
Ice::ValueHelper<RemoteMetrics, ChildInvocationMetrics>(id, total, current, totalLifetime, failures, size, replySize)
|
697
697
|
{
|
698
698
|
}
|
699
699
|
|
@@ -744,11 +744,11 @@ public:
|
|
744
744
|
* @param collocated The collocated invocation metrics map.
|
745
745
|
*/
|
746
746
|
InvocationMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, int retry, int userException, const ::IceMX::MetricsMap& remotes, const ::IceMX::MetricsMap& collocated) :
|
747
|
-
Ice::ValueHelper<InvocationMetrics, Metrics>(
|
747
|
+
Ice::ValueHelper<InvocationMetrics, Metrics>(id, total, current, totalLifetime, failures),
|
748
748
|
retry(retry),
|
749
749
|
userException(userException),
|
750
|
-
remotes(
|
751
|
-
collocated(
|
750
|
+
remotes(remotes),
|
751
|
+
collocated(collocated)
|
752
752
|
{
|
753
753
|
}
|
754
754
|
|
@@ -816,7 +816,7 @@ public:
|
|
816
816
|
* @param sentBytes The number of bytes sent by the connection.
|
817
817
|
*/
|
818
818
|
ConnectionMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int receivedBytes, long long int sentBytes) :
|
819
|
-
Ice::ValueHelper<ConnectionMetrics, Metrics>(
|
819
|
+
Ice::ValueHelper<ConnectionMetrics, Metrics>(id, total, current, totalLifetime, failures),
|
820
820
|
receivedBytes(receivedBytes),
|
821
821
|
sentBytes(sentBytes)
|
822
822
|
{
|
@@ -906,7 +906,7 @@ public:
|
|
906
906
|
{
|
907
907
|
response(::std::move(_result.returnValue), ::std::move(_result.disabledViews));
|
908
908
|
};
|
909
|
-
return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewNamesResult>(_responseCb, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMetricsViewNames, context);
|
909
|
+
return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewNamesResult>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsViewNames, context);
|
910
910
|
}
|
911
911
|
|
912
912
|
/// \cond INTERNAL
|
@@ -954,7 +954,7 @@ public:
|
|
954
954
|
::std::function<void(bool)> sent = nullptr,
|
955
955
|
const ::Ice::Context& context = ::Ice::noExplicitContext)
|
956
956
|
{
|
957
|
-
return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_enableMetricsView, name, context);
|
957
|
+
return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_enableMetricsView, name, context);
|
958
958
|
}
|
959
959
|
|
960
960
|
/// \cond INTERNAL
|
@@ -1002,7 +1002,7 @@ public:
|
|
1002
1002
|
::std::function<void(bool)> sent = nullptr,
|
1003
1003
|
const ::Ice::Context& context = ::Ice::noExplicitContext)
|
1004
1004
|
{
|
1005
|
-
return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_disableMetricsView, name, context);
|
1005
|
+
return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_disableMetricsView, name, context);
|
1006
1006
|
}
|
1007
1007
|
|
1008
1008
|
/// \cond INTERNAL
|
@@ -1071,7 +1071,7 @@ public:
|
|
1071
1071
|
{
|
1072
1072
|
response(::std::move(_result.returnValue), _result.timestamp);
|
1073
1073
|
};
|
1074
|
-
return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewResult>(_responseCb, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMetricsView, view, context);
|
1074
|
+
return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewResult>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsView, view, context);
|
1075
1075
|
}
|
1076
1076
|
|
1077
1077
|
/// \cond INTERNAL
|
@@ -1123,7 +1123,7 @@ public:
|
|
1123
1123
|
::std::function<void(bool)> sent = nullptr,
|
1124
1124
|
const ::Ice::Context& context = ::Ice::noExplicitContext)
|
1125
1125
|
{
|
1126
|
-
return _makeLamdaOutgoing<::IceMX::MetricsFailuresSeq>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
|
1126
|
+
return _makeLamdaOutgoing<::IceMX::MetricsFailuresSeq>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
|
1127
1127
|
}
|
1128
1128
|
|
1129
1129
|
/// \cond INTERNAL
|
@@ -1178,7 +1178,7 @@ public:
|
|
1178
1178
|
::std::function<void(bool)> sent = nullptr,
|
1179
1179
|
const ::Ice::Context& context = ::Ice::noExplicitContext)
|
1180
1180
|
{
|
1181
|
-
return _makeLamdaOutgoing<::IceMX::MetricsFailures>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
|
1181
|
+
return _makeLamdaOutgoing<::IceMX::MetricsFailures>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
|
1182
1182
|
}
|
1183
1183
|
|
1184
1184
|
/// \cond INTERNAL
|
@@ -1608,7 +1608,13 @@ class ICE_API UnknownMetricsView : public ::Ice::UserException
|
|
1608
1608
|
public:
|
1609
1609
|
|
1610
1610
|
UnknownMetricsView() {}
|
1611
|
+
|
1612
|
+
#ifdef ICE_CPP11_COMPILER
|
1613
|
+
UnknownMetricsView(const UnknownMetricsView&) = default;
|
1614
|
+
virtual ~UnknownMetricsView();
|
1615
|
+
#else
|
1611
1616
|
virtual ~UnknownMetricsView() throw();
|
1617
|
+
#endif
|
1612
1618
|
|
1613
1619
|
/**
|
1614
1620
|
* Obtains the Slice type ID of this exception.
|
@@ -1616,7 +1622,7 @@ public:
|
|
1616
1622
|
*/
|
1617
1623
|
virtual ::std::string ice_id() const;
|
1618
1624
|
/**
|
1619
|
-
*
|
1625
|
+
* Polymorphically clones this exception.
|
1620
1626
|
* @return A shallow copy of this exception.
|
1621
1627
|
*/
|
1622
1628
|
virtual UnknownMetricsView* ice_clone() const;
|
@@ -2474,8 +2480,13 @@ public:
|
|
2474
2480
|
{
|
2475
2481
|
}
|
2476
2482
|
|
2483
|
+
#ifdef ICE_CPP11_COMPILER
|
2484
|
+
Metrics(const Metrics&) = default;
|
2485
|
+
Metrics& operator=(const Metrics&) = default;
|
2486
|
+
#endif
|
2487
|
+
|
2477
2488
|
/**
|
2478
|
-
*
|
2489
|
+
* Polymorphically clones this object.
|
2479
2490
|
* @return A shallow copy of this object.
|
2480
2491
|
*/
|
2481
2492
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -2580,6 +2591,12 @@ public:
|
|
2580
2591
|
|
2581
2592
|
virtual ~MetricsAdmin();
|
2582
2593
|
|
2594
|
+
#ifdef ICE_CPP11_COMPILER
|
2595
|
+
MetricsAdmin() = default;
|
2596
|
+
MetricsAdmin(const MetricsAdmin&) = default;
|
2597
|
+
MetricsAdmin& operator=(const MetricsAdmin&) = default;
|
2598
|
+
#endif
|
2599
|
+
|
2583
2600
|
/**
|
2584
2601
|
* Determines whether this object supports an interface with the given Slice type ID.
|
2585
2602
|
* @param id The fully-scoped Slice type ID.
|
@@ -2756,8 +2773,13 @@ public:
|
|
2756
2773
|
{
|
2757
2774
|
}
|
2758
2775
|
|
2776
|
+
#ifdef ICE_CPP11_COMPILER
|
2777
|
+
ThreadMetrics(const ThreadMetrics&) = default;
|
2778
|
+
ThreadMetrics& operator=(const ThreadMetrics&) = default;
|
2779
|
+
#endif
|
2780
|
+
|
2759
2781
|
/**
|
2760
|
-
*
|
2782
|
+
* Polymorphically clones this object.
|
2761
2783
|
* @return A shallow copy of this object.
|
2762
2784
|
*/
|
2763
2785
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -2879,8 +2901,13 @@ public:
|
|
2879
2901
|
{
|
2880
2902
|
}
|
2881
2903
|
|
2904
|
+
#ifdef ICE_CPP11_COMPILER
|
2905
|
+
DispatchMetrics(const DispatchMetrics&) = default;
|
2906
|
+
DispatchMetrics& operator=(const DispatchMetrics&) = default;
|
2907
|
+
#endif
|
2908
|
+
|
2882
2909
|
/**
|
2883
|
-
*
|
2910
|
+
* Polymorphically clones this object.
|
2884
2911
|
* @return A shallow copy of this object.
|
2885
2912
|
*/
|
2886
2913
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -3000,8 +3027,13 @@ public:
|
|
3000
3027
|
{
|
3001
3028
|
}
|
3002
3029
|
|
3030
|
+
#ifdef ICE_CPP11_COMPILER
|
3031
|
+
ChildInvocationMetrics(const ChildInvocationMetrics&) = default;
|
3032
|
+
ChildInvocationMetrics& operator=(const ChildInvocationMetrics&) = default;
|
3033
|
+
#endif
|
3034
|
+
|
3003
3035
|
/**
|
3004
|
-
*
|
3036
|
+
* Polymorphically clones this object.
|
3005
3037
|
* @return A shallow copy of this object.
|
3006
3038
|
*/
|
3007
3039
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -3109,8 +3141,13 @@ public:
|
|
3109
3141
|
{
|
3110
3142
|
}
|
3111
3143
|
|
3144
|
+
#ifdef ICE_CPP11_COMPILER
|
3145
|
+
CollocatedMetrics(const CollocatedMetrics&) = default;
|
3146
|
+
CollocatedMetrics& operator=(const CollocatedMetrics&) = default;
|
3147
|
+
#endif
|
3148
|
+
|
3112
3149
|
/**
|
3113
|
-
*
|
3150
|
+
* Polymorphically clones this object.
|
3114
3151
|
* @return A shallow copy of this object.
|
3115
3152
|
*/
|
3116
3153
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -3205,8 +3242,13 @@ public:
|
|
3205
3242
|
{
|
3206
3243
|
}
|
3207
3244
|
|
3245
|
+
#ifdef ICE_CPP11_COMPILER
|
3246
|
+
RemoteMetrics(const RemoteMetrics&) = default;
|
3247
|
+
RemoteMetrics& operator=(const RemoteMetrics&) = default;
|
3248
|
+
#endif
|
3249
|
+
|
3208
3250
|
/**
|
3209
|
-
*
|
3251
|
+
* Polymorphically clones this object.
|
3210
3252
|
* @return A shallow copy of this object.
|
3211
3253
|
*/
|
3212
3254
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -3310,8 +3352,13 @@ public:
|
|
3310
3352
|
{
|
3311
3353
|
}
|
3312
3354
|
|
3355
|
+
#ifdef ICE_CPP11_COMPILER
|
3356
|
+
InvocationMetrics(const InvocationMetrics&) = default;
|
3357
|
+
InvocationMetrics& operator=(const InvocationMetrics&) = default;
|
3358
|
+
#endif
|
3359
|
+
|
3313
3360
|
/**
|
3314
|
-
*
|
3361
|
+
* Polymorphically clones this object.
|
3315
3362
|
* @return A shallow copy of this object.
|
3316
3363
|
*/
|
3317
3364
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -3435,8 +3482,13 @@ public:
|
|
3435
3482
|
{
|
3436
3483
|
}
|
3437
3484
|
|
3485
|
+
#ifdef ICE_CPP11_COMPILER
|
3486
|
+
ConnectionMetrics(const ConnectionMetrics&) = default;
|
3487
|
+
ConnectionMetrics& operator=(const ConnectionMetrics&) = default;
|
3488
|
+
#endif
|
3489
|
+
|
3438
3490
|
/**
|
3439
|
-
*
|
3491
|
+
* Polymorphically clones this object.
|
3440
3492
|
* @return A shallow copy of this object.
|
3441
3493
|
*/
|
3442
3494
|
virtual ::Ice::ObjectPtr ice_clone() const;
|
@@ -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.7
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -48,7 +48,7 @@
|
|
48
48
|
# if ICE_INT_VERSION % 100 >= 50
|
49
49
|
# error Beta header file detected
|
50
50
|
# endif
|
51
|
-
# if ICE_INT_VERSION % 100 <
|
51
|
+
# if ICE_INT_VERSION % 100 < 7
|
52
52
|
# error Ice patch level mismatch!
|
53
53
|
# endif
|
54
54
|
#endif
|
@@ -655,6 +655,12 @@ public:
|
|
655
655
|
|
656
656
|
virtual ~ObjectAdapter();
|
657
657
|
|
658
|
+
#ifdef ICE_CPP11_COMPILER
|
659
|
+
ObjectAdapter() = default;
|
660
|
+
ObjectAdapter(const ObjectAdapter&) = default;
|
661
|
+
ObjectAdapter& operator=(const ObjectAdapter&) = default;
|
662
|
+
#endif
|
663
|
+
|
658
664
|
/**
|
659
665
|
* Get the name of this object adapter.
|
660
666
|
* @return This object adapter's name.
|
@@ -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.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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 7
|
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.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 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 7
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -148,6 +148,12 @@ public:
|
|
148
148
|
|
149
149
|
virtual ~ObjectFactory();
|
150
150
|
|
151
|
+
#ifdef ICE_CPP11_COMPILER
|
152
|
+
ObjectFactory() = default;
|
153
|
+
ObjectFactory(const ObjectFactory&) = default;
|
154
|
+
ObjectFactory& operator=(const ObjectFactory&) = default;
|
155
|
+
#endif
|
156
|
+
|
151
157
|
/**
|
152
158
|
* Create a new object for a given object type. The type is the
|
153
159
|
* absolute Slice type id, i.e., the id relative to the
|