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

Fix some cases of C++11 exception specifications on constructors with =default or =delete

Browse source
This commit is contained in:
William S Fulton 2013-11-22 00:12:33 +00:00
commit fcd0480364
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/test-suite/cpp11_default_delete.i
View file

@ -69,4 +69,13 @@ struct moveonly {
moveonly& operator=(moveonly&&) = default; moveonly& operator=(moveonly&&) = default;
~moveonly() = default; ~moveonly() = default;
}; };
struct ConstructorThrow {
ConstructorThrow() throw() = default;
ConstructorThrow(const ConstructorThrow&) throw() = delete;
ConstructorThrow(ConstructorThrow&&) throw() = delete;
ConstructorThrow& operator=(const ConstructorThrow&) throw() = delete;
~ConstructorThrow() throw() = default;
};
%} %}

5
Examples/test-suite/cpp11_noexcept.i
View file

@ -37,8 +37,9 @@ struct NoExceptAbstract {
}; };
struct NoExceptDefaultDelete { struct NoExceptDefaultDelete {
// NoExceptDefaultDelete() noexcept = default; template<typename T> NoExceptDefaultDelete(T) noexcept = delete;
// NoExceptDefaultDelete(const NoExceptDefaultDelete&) noexcept = delete; NoExceptDefaultDelete() noexcept = default;
NoExceptDefaultDelete(const NoExceptDefaultDelete&) noexcept = delete;
NoExceptDefaultDelete(NoExceptDefaultDelete&&) = delete; NoExceptDefaultDelete(NoExceptDefaultDelete&&) = delete;
NoExceptDefaultDelete& operator=(const NoExceptDefaultDelete&) = delete; NoExceptDefaultDelete& operator=(const NoExceptDefaultDelete&) = delete;
~NoExceptDefaultDelete() noexcept = default; ~NoExceptDefaultDelete() noexcept = default;

7
Source/CParse/parser.y
View file

@ -6780,6 +6780,13 @@ ctor_end : cpp_const ctor_initializer SEMI {
$$.throwf = 0; $$.throwf = 0;
$$.nexcept = 0; $$.nexcept = 0;
} }
| exception_specification EQUAL default_delete SEMI {
$$.have_parms = 0;
$$.defarg = $3.val;
$$.throws = $1.throws;
$$.throwf = $1.throwf;
$$.nexcept = $1.nexcept;
}
; ;
ctor_initializer : COLON mem_initializer_list ctor_initializer : COLON mem_initializer_list