diff options
| author | Jason Merrill <jason@redhat.com> | 2009-05-27 18:23:41 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-05-27 18:23:41 -0400 |
| commit | c5adc4275c2a4e0f6529b9985da0bdb043af151e (patch) | |
| tree | 8d1bcc296b2e19890eba09e741714891d00a0f28 /libstdc++-v3 | |
| parent | eaf4cf4fdcd9bcf19bcb96b2a49e42f91f4d082a (diff) | |
| download | gcc-c5adc4275c2a4e0f6529b9985da0bdb043af151e.zip gcc-c5adc4275c2a4e0f6529b9985da0bdb043af151e.tar.gz gcc-c5adc4275c2a4e0f6529b9985da0bdb043af151e.tar.bz2 | |
call.c (implicit_conversion): Handle conversion from initializer-list to scalar.
* call.c (implicit_conversion): Handle conversion from
initializer-list to scalar.
(convert_like_real): Likewise. Avoid crashing on list
initialization with bad conversions.
(can_convert): Use LOOKUP_EXPLICIT.
(can_convert_arg_bad): Add flags parm.
* cp-tree.h: Adjust.
* typeck.c (convert_for_assignment): Pass flags.
From-SVN: r147933
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc index 554b59f..539dd89 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc @@ -30,4 +30,4 @@ int main() return i; } -// { dg-error "could not convert" "" { target *-*-* } 28 } +// { dg-error "cannot convert" "" { target *-*-* } 28 } diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc index 776179f..6b8d129 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc @@ -29,4 +29,4 @@ int test01() return i; } -// { dg-error "could not convert" "" { target *-*-* } 27 } +// { dg-error "cannot convert" "" { target *-*-* } 27 } |