diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist1.C | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ad2964c..bbb23ee 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2008-07-27 Jason Merrill <jason@redhat.com> + + PR c++/36943 + * decl.c (reshape_init_r): Allow C++0x initializer lists. + 2008-07-28 Richard Guenther <rguenther@suse.de> Merge from gimple-tuples-branch. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 630faac..2d9ccba 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4786,15 +4786,20 @@ reshape_init_r (tree type, reshape_iter *d, bool first_initializer_p) if (!CP_AGGREGATE_TYPE_P (type)) { /* It is invalid to initialize a non-aggregate type with a - brace-enclosed initializer. + brace-enclosed initializer before C++0x. We need to check for BRACE_ENCLOSED_INITIALIZER_P here because of g++.old-deja/g++.mike/p7626.C: a pointer-to-member constant is a CONSTRUCTOR (with a record type). */ if (TREE_CODE (init) == CONSTRUCTOR && BRACE_ENCLOSED_INITIALIZER_P (init)) /* p7626.C */ { - error ("braces around scalar initializer for type %qT", type); - init = error_mark_node; + if (SCALAR_TYPE_P (type)) + { + error ("braces around scalar initializer for type %qT", type); + init = error_mark_node; + } + else + maybe_warn_cpp0x ("extended initializer lists"); } d->cur++; diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist1.C b/gcc/testsuite/g++.dg/cpp0x/initlist1.C index b7583da..ff45f71 100644 --- a/gcc/testsuite/g++.dg/cpp0x/initlist1.C +++ b/gcc/testsuite/g++.dg/cpp0x/initlist1.C @@ -56,6 +56,9 @@ void i(initializer_list<int> l) if (p != l.end()) abort(); } +struct U { U(int, int) {} }; +U ua[] = { { 3, 2 } }; + int main() { g({1,2,3}); |