diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-10-21 16:47:14 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-10-21 16:47:14 +0000 |
| commit | 791f63f05815db689f30b7198ad6df7ee715e21c (patch) | |
| tree | 4ad6bc1318dc0a2548adea2ddf4867ad5df2031d | |
| parent | 5f1f093f8a9b74753178085ec44df9c4d769d226 (diff) | |
| download | gcc-791f63f05815db689f30b7198ad6df7ee715e21c.tar.gz | |
* decl.c (reshape_init): Tweak handling of character arrays.
* g++.dg/init/array6.C: Add additional tests.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58363 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/array6.C | 4 |
4 files changed, 11 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 350b016411f..74e5ef3b8a8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2002-10-21 Mark Mitchell <mark@codesourcery.com> + * decl.c (reshape_init): Tweak handling of character arrays. + PR c++/8218 * cp-tree.h (lang_type_class): Add contains_empty_class_p. (CLASSTYPE_CONTAINS_EMPTY_CLASS_P): New macro. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e936765de3a..b52622a03a8 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7838,7 +7838,7 @@ reshape_init (tree type, tree *initp) if (TREE_CODE (old_init_value) == STRING_CST && TREE_CODE (type) == ARRAY_TYPE - && char_type_p (TREE_TYPE (type))) + && char_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (type)))) { /* [dcl.init.string] diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e19f41d88d9..f2d02a3433c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-10-21 Mark Mitchell <mark@codesourcery.com> + + * g++.dg/init/array6.C: Add additional tests. + 2002-10-21 Ulrich Weigand <uweigand@de.ibm.com> * gcc.dg/weak/typeof-2.c: Handle s390x targets as well. diff --git a/gcc/testsuite/g++.dg/init/array6.C b/gcc/testsuite/g++.dg/init/array6.C index 1b04709cb92..6181d02bfd2 100644 --- a/gcc/testsuite/g++.dg/init/array6.C +++ b/gcc/testsuite/g++.dg/init/array6.C @@ -1,3 +1,7 @@ // { dg-do compile } char arr [][4] = { "one", "two" }; +const char arr2[][4] = { "one", "two" }; +signed char arr3[][4] = { "one", "two" }; +const unsigned char arr4[][4] = { "one", "two" }; +volatile wchar_t arr5[][4] = { L"one", L"two" }; |