diff options
| author | Leonid Koppel <lkoppel@uwaterloo.ca> | 2017-07-26 17:39:26 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-07-26 13:39:26 -0400 |
| commit | 80e7cb2d6b46db10b739d7c311524975721596ba (patch) | |
| tree | 2510d85861ff4218fe26421c11a96c5a6433da4b | |
| parent | aca97ef824afa3186a2fe43eadc705878ba5129f (diff) | |
| download | gcc-80e7cb2d6b46db10b739d7c311524975721596ba.zip gcc-80e7cb2d6b46db10b739d7c311524975721596ba.tar.gz gcc-80e7cb2d6b46db10b739d7c311524975721596ba.tar.bz2 | |
PR c++/67054 - Inherited ctor with non-default-constructible members
PR c++/67054 - Inherited ctor with non-default-constructible members
* method.c (walk_field_subobs) Consider member initializers (NSDMIs)
when deducing an inheriting constructor.
From-SVN: r250583
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/method.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/inh-ctor29.C | 23 |
3 files changed, 30 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d65dc55..b2df1ef 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-07-26 Leonid Koppel <lkoppel@uwaterloo.ca> + + PR c++/67054 - Inherited ctor with non-default-constructible members + * method.c (walk_field_subobs) Consider member initializers (NSDMIs) + when deducing an inheriting constructor. + 2017-07-21 Nathan Sidwell <nathan@acm.org> * search.c (lookup_conversion_operator): Return overloads. diff --git a/gcc/cp/method.c b/gcc/cp/method.c index cca1b14..8b07f52 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1342,7 +1342,7 @@ walk_field_subobs (tree fields, tree fnname, special_function_kind sfk, if (bad && deleted_p) *deleted_p = true; } - else if (sfk == sfk_constructor) + else if (sfk == sfk_constructor || sfk == sfk_inheriting_constructor) { bool bad; diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor29.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor29.C new file mode 100644 index 0000000..8e31f73 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor29.C @@ -0,0 +1,23 @@ +// PR c++/67054 +// { dg-do compile { target c++11 } } + +struct A +{ + A(int) {} +}; + +struct C +{ + C(int) {} +}; + +struct B : A +{ + using A::A; + C c = 42; +}; + +int main() +{ + B b = 24; +} |