Commit 298c56cd authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix "ib::fatal::~fatal': destructor never returns, potential memory leak"

warning
parent a3835fad
...@@ -834,6 +834,15 @@ error::~error() ...@@ -834,6 +834,15 @@ error::~error()
sql_print_error("InnoDB: %s", m_oss.str().c_str()); sql_print_error("InnoDB: %s", m_oss.str().c_str());
} }
#ifdef _MSC_VER
/* disable warning
"ib::fatal::~fatal': destructor never returns, potential memory leak"
on Windows.
*/
#pragma warning (push)
#pragma warning (disable : 4722)
#endif
ATTRIBUTE_NORETURN ATTRIBUTE_NORETURN
fatal::~fatal() fatal::~fatal()
{ {
...@@ -841,6 +850,10 @@ fatal::~fatal() ...@@ -841,6 +850,10 @@ fatal::~fatal()
abort(); abort();
} }
#ifdef _MSC_VER
#pragma warning (pop)
#endif
error_or_warn::~error_or_warn() error_or_warn::~error_or_warn()
{ {
if (m_error) { if (m_error) {
......
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