Unverified Commit f899838a authored by cchafe's avatar cchafe Committed by GitHub
Browse files

Merge pull request #66 from jacktrip/deprecate_dyn_except

Remove deprecated dynamic exception specification
parents 40990160 2773ca0e
......@@ -319,7 +319,7 @@ void JackTrip::startProcess(
#ifdef WAIRTOMASTER // WAIR
int ID
#endif // endwhere
) throw(std::invalid_argument)
)
{ //signal that catches ctrl c in rtaudio-asio mode
#if defined (__WIN_32__)
if (signal(SIGINT, sigint_handler) == SIG_ERR) {
......@@ -470,7 +470,7 @@ void JackTrip::waitThreads()
//*******************************************************************************
void JackTrip::clientStart() throw(std::invalid_argument)
void JackTrip::clientStart()
{
// For the Client mode, the peer (or server) address has to be specified by the user
if ( mPeerAddress.isEmpty() ) {
......@@ -487,7 +487,6 @@ void JackTrip::clientStart() throw(std::invalid_argument)
//*******************************************************************************
int JackTrip::serverStart(bool timeout, int udpTimeout) // udpTimeout unused
throw(std::invalid_argument, std::runtime_error)
{
// Set the peer address
if ( !mPeerAddress.isEmpty() ) {
......@@ -584,7 +583,7 @@ throw(std::invalid_argument, std::runtime_error)
//*******************************************************************************
int JackTrip::clientPingToServerStart() throw(std::invalid_argument)
int JackTrip::clientPingToServerStart()
{
//mConnectionMode = JackTrip::KSTRONG;
//mConnectionMode = JackTrip::JAMTEST;
......
......@@ -164,7 +164,7 @@ public:
#ifdef WAIRTOMASTER // wair
int ID
#endif // endwhere
) throw(std::invalid_argument);
);
/// \brief Stop the processing threads
virtual void stop();
......@@ -445,16 +445,15 @@ public:
/// \brief Set the RingBuffer objects
void setupRingBuffers();
/// \brief Starts for the CLIENT mode
void clientStart() throw(std::invalid_argument);
void clientStart();
/// \brief Starts for the SERVER mode
/// \param timout Set the server to timeout after 2 seconds if no client connections are received.
/// Usefull for the multithreaded server
/// \return 0 on success, -1 on error
int serverStart(bool timeout = false, int udpTimeout = gTimeOutMultiThreadedServer)
throw(std::invalid_argument, std::runtime_error);
int serverStart(bool timeout = false, int udpTimeout = gTimeOutMultiThreadedServer);
/// \brief Stats for the Client to Ping Server
/// \return -1 on error, 0 on success
virtual int clientPingToServerStart() throw(std::invalid_argument);
virtual int clientPingToServerStart();
private:
//void bindReceiveSocket(QUdpSocket& UdpSocket, int bind_port,
......
......@@ -98,7 +98,7 @@ UdpDataProtocol::~UdpDataProtocol()
//*******************************************************************************
void UdpDataProtocol::setPeerAddress(const char* peerHostOrIP) throw(std::invalid_argument)
void UdpDataProtocol::setPeerAddress(const char* peerHostOrIP)
{
// Get DNS Address
#if defined (__LINUX__) || (__MAC__OSX__)
......@@ -151,9 +151,9 @@ void UdpDataProtocol::setPeerAddress(const char* peerHostOrIP) throw(std::invali
}
#if defined (__WIN_32__)
void UdpDataProtocol::setSocket(SOCKET &socket) throw(std::runtime_error)
void UdpDataProtocol::setSocket(SOCKET &socket)
#else
void UdpDataProtocol::setSocket(int &socket) throw(std::runtime_error)
void UdpDataProtocol::setSocket(int &socket)
#endif
{
//If we haven't been passed a valid socket, then we should bind one.
......@@ -176,9 +176,9 @@ void UdpDataProtocol::setSocket(int &socket) throw(std::runtime_error)
//*******************************************************************************
#if defined (__WIN_32__)
SOCKET UdpDataProtocol::bindSocket() throw(std::runtime_error)
SOCKET UdpDataProtocol::bindSocket()
#else
int UdpDataProtocol::bindSocket() throw(std::runtime_error)
int UdpDataProtocol::bindSocket()
#endif
{
QMutexLocker locker(&sUdpMutex);
......
......@@ -87,12 +87,12 @@ public:
/** \brief Set the Peer address to connect to
* \param peerHostOrIP IPv4 number or host name
*/
void setPeerAddress(const char* peerHostOrIP) throw(std::invalid_argument);
void setPeerAddress(const char* peerHostOrIP);
#if defined (__WIN_32__)
void setSocket(SOCKET &socket) throw(std::runtime_error);
void setSocket(SOCKET &socket);
#else
void setSocket(int &socket) throw(std::runtime_error);
void setSocket(int &socket);
#endif
/** \brief Receives a packet. It blocks until a packet is received
......@@ -160,9 +160,9 @@ protected:
/** \brief Binds the UDP socket to the available address and specified port
*/
#if defined (__WIN_32__)
SOCKET bindSocket() throw(std::runtime_error);
SOCKET bindSocket();
#else
int bindSocket() throw(std::runtime_error);
int bindSocket();
#endif
/** \brief This function blocks until data is available for reading in the
......
......@@ -342,7 +342,7 @@ void UdpMasterListener::sendToPoolPrototype(int id)
//*******************************************************************************
void UdpMasterListener::bindUdpSocket(QUdpSocket& udpsocket, int port) throw(std::runtime_error)
void UdpMasterListener::bindUdpSocket(QUdpSocket& udpsocket, int port)
{
// QHostAddress::Any : let the kernel decide the active address
if ( !udpsocket.bind(QHostAddress::Any,
......
......@@ -98,7 +98,7 @@ private:
* \param udpsocket a QUdpSocket
* \param port Port number
*/
static void bindUdpSocket(QUdpSocket& udpsocket, int port) throw(std::runtime_error);
static void bindUdpSocket(QUdpSocket& udpsocket, int port);
int readClientUdpPort(QTcpSocket* clientConnection);
int sendUdpPort(QTcpSocket* clientConnection, int udp_port);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment