summaryrefslogtreecommitdiff
path: root/gcc/cp/pt.c
diff options
context:
space:
mode:
authornathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>2017-09-05 19:52:56 +0000
committernathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>2017-09-05 19:52:56 +0000
commit17f6e81c7cb9e41e1b83edeff2c4cc8aa0c7e7a9 (patch)
tree17b1662a0ec811b4bf63a3de09bbeab4aeb86486 /gcc/cp/pt.c
parent1694a564a16d2403ba1d80778eaacd49b1a62b2c (diff)
downloadgcc-17f6e81c7cb9e41e1b83edeff2c4cc8aa0c7e7a9.tar.gz
* class.c (unreverse_member_declarations): Remove extraneous if.
* pt.c (push_template_decl_real): Use string concatenation, not \<newline>. Add %<..%>. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@251724 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/pt.c')
-rw-r--r--gcc/cp/pt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d5ab93985a3..aeb523d5232 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;