diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-09-05 19:52:56 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-09-05 19:52:56 +0000 |
| commit | 36560e9e15a83b068d3a9dd12816a2529086e69a (patch) | |
| tree | 17b1662a0ec811b4bf63a3de09bbeab4aeb86486 | |
| parent | 55b2ce1c919ae1a5460f8bfd105f64155853d701 (diff) | |
| download | gcc-36560e9e15a83b068d3a9dd12816a2529086e69a.zip gcc-36560e9e15a83b068d3a9dd12816a2529086e69a.tar.gz gcc-36560e9e15a83b068d3a9dd12816a2529086e69a.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 26b51ec..e0743ae 100644 --- 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 e5f237c..9e740db 100644 --- 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 d5ab939..aeb523d 100644 --- 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; |