class.c (unreverse_member_declarations): Remove extraneous if.

	* class.c (unreverse_member_declarations): Remove extraneous if.
	* pt.c (push_template_decl_real): Use string concatenation, not
	\<newline>.  Add %<..%>.

From-SVN: r251724

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 26b51ec3b16f20ff51a5cc2565b0aadf1813691c..e0743aefa14fe83abeb1f3aa4c5e7e40a5aa6780 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-05  Nathan Sidwell  <nathan@acm.org>
+
+       * class.c (unreverse_member_declarations): Remove extraneous if.
+       * pt.c (push_template_decl_real): Use string concatenation, not
+       \<newline>.  Add %<..%>.
+
 2017-09-05  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/81942

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index e5f237cb0525cc55eaf0c9c1960b1acb29975c1d..9e740dbbfb7b7c01c9ba54f45c8376e3a63d4195 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -7070,8 +7070,7 @@ unreverse_member_declarations (tree t)
   if (prev)
     {
       DECL_CHAIN (TYPE_FIELDS (t)) = x;
-      if (prev)
-       TYPE_FIELDS (t) = prev;
+      TYPE_FIELDS (t) = prev;
     }
 }
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d5ab93985a3f0192c4749227c33b2f0adc48410a..aeb523d52326b57e2d1fd4e005eaa8331ad624c2 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -5572,11 +5572,11 @@ push_template_decl_real (tree decl, bool is_friend)
          (TI_ARGS (tinfo),
           TI_ARGS (get_template_info (DECL_TEMPLATE_RESULT (tmpl)))))
        {
-         error ("\
-template arguments to %qD do not match original template %qD",
-                decl, DECL_TEMPLATE_RESULT (tmpl));
+         error ("template arguments to %qD do not match original"
+                "template %qD", decl, DECL_TEMPLATE_RESULT (tmpl));
          if (!uses_template_parms (TI_ARGS (tinfo)))
-           inform (input_location, "use template<> for an explicit specialization");
+           inform (input_location, "use %<template<>%> for"
+                   " an explicit specialization");
          /* Avoid crash in import_export_decl.  */
          DECL_INTERFACE_KNOWN (decl) = 1;
          return error_mark_node;