Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into macos-windows-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
@externl
externl committed Jan 8, 2024
2 parents 5a15e90 + a3435d2 commit 1af122c
Show file tree
Hide file tree
Showing 173 changed files with 400 additions and 3,566 deletions.
22 changes: 10 additions & 12 deletions cpp/include/Ice/Communicator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,11 +628,9 @@ class ICE_API Communicator : public virtual LocalObject

virtual ~Communicator();

#ifdef ICE_CPP11_COMPILER
Communicator() = default;
Communicator(const Communicator&) = default;
Communicator& operator=(const Communicator&) = default;
#endif

/**
* Destroy the communicator. This operation calls {@link #shutdown} implicitly. Calling {@link #destroy} cleans up
Expand All @@ -641,7 +639,7 @@ class ICE_API Communicator : public virtual LocalObject
* @see #shutdown
* @see ObjectAdapter#destroy
*/
virtual void destroy() ICE_NOEXCEPT = 0;
virtual void destroy() noexcept = 0;

/**
* Shuts down this communicator's server functionality, which includes the deactivation of all object adapters.
Expand All @@ -654,7 +652,7 @@ class ICE_API Communicator : public virtual LocalObject
* @see #waitForShutdown
* @see ObjectAdapter#deactivate
*/
virtual void shutdown() ICE_NOEXCEPT = 0;
virtual void shutdown() noexcept = 0;

/**
* Wait until the application has called {@link #shutdown} (or {@link #destroy}). On the server side, this
Expand All @@ -667,14 +665,14 @@ class ICE_API Communicator : public virtual LocalObject
* @see #destroy
* @see ObjectAdapter#waitForDeactivate
*/
virtual void waitForShutdown() ICE_NOEXCEPT = 0;
virtual void waitForShutdown() noexcept = 0;

/**
* Check whether communicator has been shut down.
* @return True if the communicator has been shut down; false otherwise.
* @see #shutdown
*/
virtual bool isShutdown() const ICE_NOEXCEPT = 0;
virtual bool isShutdown() const noexcept = 0;

/**
* Convert a stringified proxy into a proxy.
Expand Down Expand Up @@ -815,34 +813,34 @@ class ICE_API Communicator : public virtual LocalObject
*
* @deprecated findObjectFactory() is deprecated, use ValueFactoryManager::find() instead.
*/
ICE_DEPRECATED_API("findObjectFactory() is deprecated, use ValueFactoryManager::find() instead.") virtual ObjectFactoryPtr findObjectFactory(const ::std::string& id) const ICE_NOEXCEPT = 0;
ICE_DEPRECATED_API("findObjectFactory() is deprecated, use ValueFactoryManager::find() instead.") virtual ObjectFactoryPtr findObjectFactory(const ::std::string& id) const noexcept = 0;

/**
* Get the implicit context associated with this communicator.
* @return The implicit context associated with this communicator; returns null when the property Ice.ImplicitContext
* is not set or is set to None.
*/
virtual ImplicitContextPtr getImplicitContext() const ICE_NOEXCEPT = 0;
virtual ImplicitContextPtr getImplicitContext() const noexcept = 0;

/**
* Get the properties for this communicator.
* @return This communicator's properties.
* @see Properties
*/
virtual PropertiesPtr getProperties() const ICE_NOEXCEPT = 0;
virtual PropertiesPtr getProperties() const noexcept = 0;

/**
* Get the logger for this communicator.
* @return This communicator's logger.
* @see Logger
*/
virtual LoggerPtr getLogger() const ICE_NOEXCEPT = 0;
virtual LoggerPtr getLogger() const noexcept = 0;

/**
* Get the observer resolver object for this communicator.
* @return This communicator's observer resolver object.
*/
virtual ::Ice::Instrumentation::CommunicatorObserverPtr getObserver() const ICE_NOEXCEPT = 0;
virtual ::Ice::Instrumentation::CommunicatorObserverPtr getObserver() const noexcept = 0;

/**
* Get the default router for this communicator.
Expand Down Expand Up @@ -897,7 +895,7 @@ class ICE_API Communicator : public virtual LocalObject
* @return This communicator's value factory manager.
* @see ValueFactoryManager
*/
virtual ValueFactoryManagerPtr getValueFactoryManager() const ICE_NOEXCEPT = 0;
virtual ValueFactoryManagerPtr getValueFactoryManager() const noexcept = 0;

/**
* Flush any pending batch requests for this communicator. This means all batch requests invoked on fixed proxies
Expand Down
31 changes: 7 additions & 24 deletions cpp/include/Ice/Connection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1027,10 +1027,8 @@ class ICE_API ConnectionInfo : public virtual LocalObject
{
}

#ifdef ICE_CPP11_COMPILER
ConnectionInfo(const ConnectionInfo&) = default;
ConnectionInfo& operator=(const ConnectionInfo&) = default;
#endif

/**
* The information of the underyling transport or null if there's no underlying transport.
Expand Down Expand Up @@ -1075,11 +1073,9 @@ class ICE_API CloseCallback : public virtual LocalObject

virtual ~CloseCallback();

#ifdef ICE_CPP11_COMPILER
CloseCallback() = default;
CloseCallback(const CloseCallback&) = default;
CloseCallback& operator=(const CloseCallback&) = default;
#endif

/**
* This method is called by the connection when the connection is closed. If the callback needs more information
Expand Down Expand Up @@ -1115,11 +1111,9 @@ class ICE_API HeartbeatCallback : public virtual LocalObject

virtual ~HeartbeatCallback();

#ifdef ICE_CPP11_COMPILER
HeartbeatCallback() = default;
HeartbeatCallback(const HeartbeatCallback&) = default;
HeartbeatCallback& operator=(const HeartbeatCallback&) = default;
#endif

/**
* This method is called by the connection when a heartbeat is received from the peer.
Expand Down Expand Up @@ -1151,19 +1145,16 @@ class ICE_API Connection : public virtual LocalObject
typedef ConnectionPtr PointerType;

virtual ~Connection();

#ifdef ICE_CPP11_COMPILER
Connection() = default;
Connection(const Connection&) = default;
Connection& operator=(const Connection&) = default;
#endif

/**
* Manually close the connection using the specified closure mode.
* @param mode Determines how the connection will be closed.
* @see ConnectionClose
*/
virtual void close(ConnectionClose mode) ICE_NOEXCEPT = 0;
virtual void close(ConnectionClose mode) noexcept = 0;

/**
* Create a special proxy that always uses this connection. This can be used for callbacks from a server to a
Expand Down Expand Up @@ -1193,13 +1184,13 @@ class ICE_API Connection : public virtual LocalObject
* @return The object adapter that dispatches requests for the connection, or null if no adapter is set.
* @see #setAdapter
*/
virtual ObjectAdapterPtr getAdapter() const ICE_NOEXCEPT = 0;
virtual ObjectAdapterPtr getAdapter() const noexcept = 0;

/**
* Get the endpoint from which the connection was created.
* @return The endpoint from which the connection was created.
*/
virtual EndpointPtr getEndpoint() const ICE_NOEXCEPT = 0;
virtual EndpointPtr getEndpoint() const noexcept = 0;

/**
* Flush any pending batch requests for this connection. This means all batch requests invoked on fixed proxies
Expand Down Expand Up @@ -1307,25 +1298,25 @@ class ICE_API Connection : public virtual LocalObject
* Get the ACM parameters.
* @return The ACM parameters.
*/
virtual ACM getACM() ICE_NOEXCEPT = 0;
virtual ACM getACM() noexcept = 0;

/**
* Return the connection type. This corresponds to the endpoint type, i.e., "tcp", "udp", etc.
* @return The type of the connection.
*/
virtual ::std::string type() const ICE_NOEXCEPT = 0;
virtual ::std::string type() const noexcept = 0;

/**
* Get the timeout for the connection.
* @return The connection's timeout.
*/
virtual Int timeout() const ICE_NOEXCEPT = 0;
virtual Int timeout() const noexcept = 0;

/**
* Return a description of the connection as human readable text, suitable for logging or error messages.
* @return The description of the connection as human readable text.
*/
virtual ::std::string toString() const ICE_NOEXCEPT = 0;
virtual ::std::string toString() const noexcept = 0;

/**
* Returns the connection information.
Expand Down Expand Up @@ -1402,10 +1393,8 @@ class ICE_API IPConnectionInfo : public ConnectionInfo
{
}

#ifdef ICE_CPP11_COMPILER
IPConnectionInfo(const IPConnectionInfo&) = default;
IPConnectionInfo& operator=(const IPConnectionInfo&) = default;
#endif

/**
* The local address.
Expand Down Expand Up @@ -1476,10 +1465,8 @@ class ICE_API TCPConnectionInfo : public IPConnectionInfo
{
}

#ifdef ICE_CPP11_COMPILER
TCPConnectionInfo(const TCPConnectionInfo&) = default;
TCPConnectionInfo& operator=(const TCPConnectionInfo&) = default;
#endif

/**
* The connection buffer receive size.
Expand Down Expand Up @@ -1547,10 +1534,8 @@ class ICE_API UDPConnectionInfo : public IPConnectionInfo
{
}

#ifdef ICE_CPP11_COMPILER
UDPConnectionInfo(const UDPConnectionInfo&) = default;
UDPConnectionInfo& operator=(const UDPConnectionInfo&) = default;
#endif

/**
* The multicast address.
Expand Down Expand Up @@ -1612,10 +1597,8 @@ class ICE_API WSConnectionInfo : public ConnectionInfo
{
}

#ifdef ICE_CPP11_COMPILER
WSConnectionInfo(const WSConnectionInfo&) = default;
WSConnectionInfo& operator=(const WSConnectionInfo&) = default;
#endif

/**
* The headers from the HTTP upgrade request.
Expand Down
26 changes: 5 additions & 21 deletions cpp/include/Ice/Endpoint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,27 +476,25 @@ class ICE_API EndpointInfo : public virtual LocalObject
{
}

#ifdef ICE_CPP11_COMPILER
EndpointInfo(const EndpointInfo&) = default;
EndpointInfo& operator=(const EndpointInfo&) = default;
#endif

/**
* Returns the type of the endpoint.
* @return The endpoint type.
*/
virtual Short type() const ICE_NOEXCEPT = 0;
virtual Short type() const noexcept = 0;

/**
* Returns true if this endpoint is a datagram endpoint.
* @return True for a datagram endpoint.
*/
virtual bool datagram() const ICE_NOEXCEPT = 0;
virtual bool datagram() const noexcept = 0;

/**
* @return True for a secure endpoint.
*/
virtual bool secure() const ICE_NOEXCEPT = 0;
virtual bool secure() const noexcept = 0;

/**
* The information of the underyling endpoint or null if there's no underlying endpoint.
Expand Down Expand Up @@ -535,24 +533,21 @@ class ICE_API Endpoint : public virtual LocalObject
typedef EndpointPtr PointerType;

virtual ~Endpoint();

#ifdef ICE_CPP11_COMPILER
Endpoint() = default;
Endpoint(const Endpoint&) = default;
Endpoint& operator=(const Endpoint&) = default;
#endif

/**
* Return a string representation of the endpoint.
* @return The string representation of the endpoint.
*/
virtual ::std::string toString() const ICE_NOEXCEPT = 0;
virtual ::std::string toString() const noexcept = 0;

/**
* Returns the endpoint information.
* @return The endpoint information class.
*/
virtual EndpointInfoPtr getInfo() const ICE_NOEXCEPT = 0;
virtual EndpointInfoPtr getInfo() const noexcept = 0;
};

/// \cond INTERNAL
Expand Down Expand Up @@ -600,11 +595,8 @@ class ICE_API IPEndpointInfo : public EndpointInfo
sourceAddress(sourceAddress)
{
}

#ifdef ICE_CPP11_COMPILER
IPEndpointInfo(const IPEndpointInfo&) = default;
IPEndpointInfo& operator=(const IPEndpointInfo&) = default;
#endif

/**
* The host or address configured with the endpoint.
Expand Down Expand Up @@ -663,10 +655,8 @@ class ICE_API TCPEndpointInfo : public IPEndpointInfo
{
}

#ifdef ICE_CPP11_COMPILER
TCPEndpointInfo(const TCPEndpointInfo&) = default;
TCPEndpointInfo& operator=(const TCPEndpointInfo&) = default;
#endif
};

/// \cond INTERNAL
Expand Down Expand Up @@ -716,10 +706,8 @@ class ICE_API UDPEndpointInfo : public IPEndpointInfo
{
}

#ifdef ICE_CPP11_COMPILER
UDPEndpointInfo(const UDPEndpointInfo&) = default;
UDPEndpointInfo& operator=(const UDPEndpointInfo&) = default;
#endif

/**
* The multicast interface.
Expand Down Expand Up @@ -772,10 +760,8 @@ class ICE_API WSEndpointInfo : public EndpointInfo
{
}

#ifdef ICE_CPP11_COMPILER
WSEndpointInfo(const WSEndpointInfo&) = default;
WSEndpointInfo& operator=(const WSEndpointInfo&) = default;
#endif

/**
* The URI configured with the endpoint.
Expand Down Expand Up @@ -827,10 +813,8 @@ class ICE_API OpaqueEndpointInfo : public EndpointInfo
{
}

#ifdef ICE_CPP11_COMPILER
OpaqueEndpointInfo(const OpaqueEndpointInfo&) = default;
OpaqueEndpointInfo& operator=(const OpaqueEndpointInfo&) = default;
#endif

/**
* The encoding version of the opaque endpoint (to decode or encode the rawBytes).
Expand Down
10 changes: 0 additions & 10 deletions cpp/include/Ice/Exception.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,8 @@ class ICE_API LocalException : public IceUtil::Exception
* @param line The line number at which the exception was raised, typically __LINE__.
*/
LocalException(const char* file, int line);

#ifdef ICE_CPP11_COMPILER
LocalException(const LocalException&) = default;
virtual ~LocalException();
#else
virtual ~LocalException() throw();
#endif

/**
* Polymorphically clones this exception.
Expand Down Expand Up @@ -117,13 +112,8 @@ class ICE_API SystemException : public IceUtil::Exception
* @param line The line number at which the exception was raised, typically __LINE__.
*/
SystemException(const char* file, int line);

#ifdef ICE_CPP11_COMPILER
SystemException(const SystemException&) = default;
virtual ~SystemException();
#else
virtual ~SystemException() throw();
#endif

/**
* Polymorphically clones this exception.
Expand Down
Loading

0 comments on commit 1af122c

Please sign in to comment.