aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2019-02-11 19:46:54 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2019-02-11 19:46:54 +0000
commitf9fb2d275ec5137b514167dd96c2f591e6f3658f (patch)
tree43c8d9e62dd8dd1618f4cf4e4107c7e68984a3fc /gcc
parent62b835cd8babe3ce55c4d72553910e2fa8258e8d (diff)
downloadgcc-f9fb2d275ec5137b514167dd96c2f591e6f3658f.zip
gcc-f9fb2d275ec5137b514167dd96c2f591e6f3658f.tar.gz
gcc-f9fb2d275ec5137b514167dd96c2f591e6f3658f.tar.bz2
* typeck2.c (digest_init_r): Remove commented code.
From-SVN: r268779
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/typeck2.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 76f22f5..885cd50 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-02-11 Marek Polacek <polacek@redhat.com>
+
+ * typeck2.c (digest_init_r): Remove commented code.
+
2019-02-11 Martin Sebor <msebor@redhat.com>
PR c++/87996
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 0756eb6..05998a3 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1099,7 +1099,6 @@ digest_init_r (tree type, tree init, int nested, int flags,
tree typ1 = TYPE_MAIN_VARIANT (TREE_TYPE (type));
if (char_type_p (typ1)
- /*&& init */
&& TREE_CODE (stripped_init) == STRING_CST)
{
tree char_type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (init)));