OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/51553 (brace initialization and conversion operators) 

PR c++/51553
	* call.c (add_function_candidate): Allow conversions for the copy
	parm in list-initialization unless the argument is an init-list.

From-SVN: r182495
This commit is contained in:
Jason Merrill 2011-12-19 15:10:37 -05:00 committed by Jason Merrill
parent d58d6eb5ec
commit 00ef705904
4 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2011-12-19 Jason Merrill <jason@redhat.com>
PR c++/51553
* call.c (add_function_candidate): Allow conversions for the copy
parm in list-initialization unless the argument is an init-list.
2011-12-19 Jakub Jelinek <jakub@redhat.com>
PR c++/51619

6
gcc/cp/call.c
View File

@ -1964,8 +1964,10 @@ add_function_candidate (struct z_candidate **candidates,
{
lflags |= LOOKUP_COPY_PARM;
/* We allow user-defined conversions within init-lists, but
not for the copy constructor. */
if (flags & LOOKUP_NO_COPY_CTOR_CONVERSION)
don't list-initialize the copy parm, as that would mean
using two levels of braces for the same type. */
if ((flags & LOOKUP_NO_COPY_CTOR_CONVERSION)
&& BRACE_ENCLOSED_INITIALIZER_P (arg))
lflags |= LOOKUP_NO_CONVERSION;
}
else

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2011-12-19 Jason Merrill <jason@redhat.com>
PR c++/51553
* g++.dg/cpp0x/initlist64.C: New.
PR c++/51228
* c-c++-common/transparent-union-1.c: New.

29
gcc/testsuite/g++.dg/cpp0x/initlist64.C Normal file
View File

@ -0,0 +1,29 @@
// PR c++/51553
// { dg-options -std=c++0x }
struct X
{
X();
};
struct Y
{
operator X() const;
};
struct Z
{
explicit operator X() const;
};
X a = { Y() };
X aa = Y();
X b{ Y() };
X bb(Y());
X c = { Z() }; // { dg-error "" "" { xfail *-*-* } }
X cc = Z(); // { dg-error "" }
X d{ Z() };
X dd( Z() );