diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3a270bc..2bc1ce0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2004-07-27 Kelley Cook <kcook@gcc.gnu.org> + + * pt.c, typeck.c: Remove spurious carriage returns. + 2004-07-27 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> PR c++/14429 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 7ae18f8..def6310 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1696,8 +1696,8 @@ check_explicit_specialization (tree declarator, error("too few template parameter lists in declaration of `%D'", decl); else - error("explicit specialization of `%D' must be introduced by "
- "`template <>'", decl);
+ error("explicit specialization of `%D' must be introduced by " + "`template <>'", decl); /* Fall through. */ case tsk_expl_spec: diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 640f512..cad077a 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5978,7 +5978,7 @@ check_return_expr (tree retval) the current class reference, it is ok. */ else if (TREE_CODE (retval) == INDIRECT_REF && TREE_CODE (TREE_OPERAND (retval, 0)) == CALL_EXPR) - warn = false;
+ warn = false; } if (warn) |