Commit e4491400 authored by Rob Latham's avatar Rob Latham
Browse files

silence dynamic exception warning

C++11 deprecated "dymaic exception specifications".  There may be more
subtle ways to get rid of those, but here is a big hammer approach to
quieting that warning.
parent 7a87acfa
...@@ -192,7 +192,7 @@ public: ...@@ -192,7 +192,7 @@ public:
/** /**
* @brief Destructor. * @brief Destructor.
*/ */
~bulk() throw(margo_exception) { ~bulk() {
if(m_bulk != HG_BULK_NULL) { if(m_bulk != HG_BULK_NULL) {
hg_return_t ret = margo_bulk_free(m_bulk); hg_return_t ret = margo_bulk_free(m_bulk);
MARGO_ASSERT(ret, margo_bulk_free); MARGO_ASSERT(ret, margo_bulk_free);
......
...@@ -134,7 +134,7 @@ public: ...@@ -134,7 +134,7 @@ public:
/** /**
* @brief Destructor. * @brief Destructor.
*/ */
~callable_remote_procedure() throw(margo_exception) { ~callable_remote_procedure() {
if(m_handle != HG_HANDLE_NULL) { if(m_handle != HG_HANDLE_NULL) {
hg_return_t ret = margo_destroy(m_handle); hg_return_t ret = margo_destroy(m_handle);
MARGO_ASSERT(ret, margo_destroy); MARGO_ASSERT(ret, margo_destroy);
......
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
/** /**
* @brief Destructor. * @brief Destructor.
*/ */
~endpoint() throw(margo_exception); ~endpoint();
/** /**
* @brief Creates a string representation of the endpoint's address. * @brief Creates a string representation of the endpoint's address.
......
...@@ -189,7 +189,7 @@ public: ...@@ -189,7 +189,7 @@ public:
/** /**
* @brief Destructor. * @brief Destructor.
*/ */
~engine() throw(margo_exception) { ~engine() {
if(m_owns_mid) { if(m_owns_mid) {
if(m_is_server) { if(m_is_server) {
if(!m_finalize_called) if(!m_finalize_called)
......
...@@ -60,7 +60,6 @@ std::string translate_margo_error_code(hg_return_t ret); ...@@ -60,7 +60,6 @@ std::string translate_margo_error_code(hg_return_t ret);
std::stringstream msg; \ std::stringstream msg; \
msg << "Function returned "; \ msg << "Function returned "; \
msg << translate_margo_error_code(__ret__); \ msg << translate_margo_error_code(__ret__); \
throw margo_exception(#__fun__, __FILE__, __LINE__, msg.str());\
}\ }\
} while(0); } while(0);
......
...@@ -95,7 +95,7 @@ public: ...@@ -95,7 +95,7 @@ public:
/** /**
* @brief Destructor. * @brief Destructor.
*/ */
~request() throw(margo_exception) { ~request() {
hg_return_t ret = margo_destroy(m_handle); hg_return_t ret = margo_destroy(m_handle);
MARGO_ASSERT(ret, margo_destroy); MARGO_ASSERT(ret, margo_destroy);
} }
......
...@@ -48,7 +48,7 @@ endpoint& endpoint::operator=(endpoint&& other) { ...@@ -48,7 +48,7 @@ endpoint& endpoint::operator=(endpoint&& other) {
return *this; return *this;
} }
endpoint::~endpoint() throw(margo_exception) { endpoint::~endpoint() {
if(m_addr != HG_ADDR_NULL) { if(m_addr != HG_ADDR_NULL) {
hg_return_t ret = margo_addr_free(m_engine->m_mid, m_addr); hg_return_t ret = margo_addr_free(m_engine->m_mid, m_addr);
MARGO_ASSERT(ret, margo_addr_free); MARGO_ASSERT(ret, margo_addr_free);
......
Markdown is supported
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