From: Marek Polacek <polacek@redhat.com>
Date: Mon, 11 Feb 2019 19:46:54 +0000 (+0000)
Subject: * typeck2.c (digest_init_r): Remove commented code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9fb2d275ec5137b514167dd96c2f591e6f3658f;p=gcc.git

* typeck2.c (digest_init_r): Remove commented code.

From-SVN: r268779
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 76f22f5e363..885cd505653 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 0756eb64872..05998a3dc17 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)));