test-suite support for C++17: exception specification throw removal
This commit is contained in:
parent
ebd6558a30
commit
35b792daed
23 changed files with 190 additions and 419 deletions
|
|
@ -5,27 +5,23 @@
|
|||
* if there were also functions throwing 'std::logic_error' and
|
||||
* 'std::exception' then the bug would not be fully replicated */
|
||||
|
||||
// throw is invalid in C++17 and later, only SWIG to use it
|
||||
#define TESTCASE_THROW(TYPES...) throw(TYPES)
|
||||
%{
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
|
||||
#endif
|
||||
#if __GNUC__ >= 7
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated" // dynamic exception specifications are deprecated in C++11
|
||||
#endif
|
||||
#define TESTCASE_THROW(TYPES...)
|
||||
%}
|
||||
|
||||
%{
|
||||
#include <exception>
|
||||
#include <stdexcept>
|
||||
void test_domain_error() throw(std::domain_error)
|
||||
void test_domain_error() TESTCASE_THROW(std::domain_error, int)
|
||||
{ throw std::domain_error("std::domain_error"); }
|
||||
%}
|
||||
|
||||
%include <std_string.i>
|
||||
#define SWIG_STD_EXCEPTIONS_AS_CLASSES
|
||||
%include <std_except.i>
|
||||
void test_domain_error() throw(std::domain_error)
|
||||
void test_domain_error() TESTCASE_THROW(std::domain_error, int)
|
||||
{ throw std::domain_error("std::domain_error"); }
|
||||
|
||||
%inline %{
|
||||
|
|
@ -36,11 +32,3 @@ bool is_python_builtin() { return false; }
|
|||
#endif
|
||||
%}
|
||||
|
||||
%{
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
|
||||
#endif
|
||||
#if __GNUC__ >= 7
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
%}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue