diff options
| author | Jason Merrill <jason@redhat.com> | 2011-10-02 17:44:52 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-10-02 17:44:52 -0400 |
| commit | f10eaa2dcc0081c7abbc326b500b84e03f777d05 (patch) | |
| tree | 1eb84d79741501950988c6ec9cd85a6956dcb7a0 /gcc/cp/method.c | |
| parent | 3bf108578e7f46273be8dbc35797d5e7ad4b2336 (diff) | |
| download | gcc-f10eaa2dcc0081c7abbc326b500b84e03f777d05.zip gcc-f10eaa2dcc0081c7abbc326b500b84e03f777d05.tar.gz gcc-f10eaa2dcc0081c7abbc326b500b84e03f777d05.tar.bz2 | |
class.c (fixed_type_or_null): Handle NSDMI.
* class.c (fixed_type_or_null): Handle NSDMI.
* method.c (walk_field_subobs): Disable NSDMI noexcept checking
for now.
From-SVN: r179435
Diffstat (limited to 'gcc/cp/method.c')
| -rw-r--r-- | gcc/cp/method.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 1316dfb..f4a3ea6 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1042,12 +1042,16 @@ walk_field_subobs (tree fields, tree fnname, special_function_kind sfk, inform (0, "initializer for %q+#D is invalid", field); if (trivial_p) *trivial_p = false; +#if 0 /* Core 1351: If the field has an NSDMI that could throw, the default constructor is noexcept(false). FIXME this is - broken by deferred parsing and 1360 saying we can't - lazily declare a non-trivial default constructor. */ + broken by deferred parsing and 1360 saying we can't lazily + declare a non-trivial default constructor. Also this + needs to do deferred instantiation. Disable until the + conflict between 1351 and 1360 is resolved. */ if (spec_p && !expr_noexcept_p (DECL_INITIAL (field), complain)) *spec_p = noexcept_false_spec; +#endif /* Don't do the normal processing. */ continue; |