jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace std::unexpected_handler with std::terminate_handler to be c++17 compliant

Browse source 
Closes #1538
This commit is contained in:
William S Fulton 2019-06-07 19:55:15 +01:00
commit 5c1c69d140
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/python/director.swg
View file

@ -219,7 +219,7 @@ namespace Swig {
PyErr_Print(); PyErr_Print();
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl std::cerr << "This exception was caught by the SWIG UnknownExceptionHandler." << std::endl
<< "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
<< std::endl << std::endl
<< "Exception is being re-thrown, program will likely abort/terminate." << std::endl; << "Exception is being re-thrown, program will likely abort/terminate." << std::endl;
@ -227,14 +227,13 @@ namespace Swig {
} }
public: public:
std::terminate_handler old;
std::unexpected_handler old; UnknownExceptionHandler(std::terminate_handler nh = handler) {
UnknownExceptionHandler(std::unexpected_handler nh = handler) { old = std::set_terminate(nh);
old = std::set_unexpected(nh);
} }
~UnknownExceptionHandler() { ~UnknownExceptionHandler() {
std::set_unexpected(old); std::set_terminate(old);
} }
#endif #endif
}; };

10
Lib/ruby/director.swg
View file

@ -170,7 +170,7 @@ namespace Swig {
std::cerr << std::endl std::cerr << std::endl
<< "Ruby interpreter traceback:" << std::endl; << "Ruby interpreter traceback:" << std::endl;
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl std::cerr << "This exception was caught by the SWIG UnknownExceptionHandler." << std::endl
<< "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
<< std::endl << std::endl
<< "Exception is being re-thrown, program will like abort/terminate." << std::endl; << "Exception is being re-thrown, program will like abort/terminate." << std::endl;
@ -178,13 +178,13 @@ namespace Swig {
} }
public: public:
std::unexpected_handler old; std::terminate_handler old;
UnknownExceptionHandler(std::unexpected_handler nh = handler) { UnknownExceptionHandler(std::terminate_handler nh = handler) {
old = std::set_unexpected(nh); old = std::set_terminate(nh);
} }
~UnknownExceptionHandler() { ~UnknownExceptionHandler() {
std::set_unexpected(old); std::set_terminate(old);
} }
#endif #endif
}; };