aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelley Cook <kcook@gcc.gnu.org>2004-12-08 23:47:20 +0000
committerR. Kelley Cook <kcook@gcc.gnu.org>2004-12-08 23:47:20 +0000
commit8a21aa30d812d9f735896484d6ece2448942a549 (patch)
tree650274005811accf2bd368bb1577e37f0177df5c
parent323c74dacc07833f98c5f289b4146ecdab63496a (diff)
downloadgcc-8a21aa30d812d9f735896484d6ece2448942a549.zip
gcc-8a21aa30d812d9f735896484d6ece2448942a549.tar.gz
gcc-8a21aa30d812d9f735896484d6ece2448942a549.tar.bz2
typeck.c: Remove DOS line endings.
2004-12-08 Kelley Cook <kcook@gcc.gnu.org> * typeck.c: Remove DOS line endings. From-SVN: r91919
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/typeck.c12
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 13cfc69..d37b963 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-08 Kelley Cook <kcook@gcc.gnu.org>
+
+ * typeck.c: Remove DOS line endings.
+
2004-12-08 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/18100
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index a06101c..a26bff4b 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3728,12 +3728,12 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert)
/* CONVERT_EXPR stands for unary plus in this context. */
case CONVERT_EXPR:
case NEGATE_EXPR:
- {
- int flags = WANT_ARITH | WANT_ENUM;
- /* Unary plus (but not unary minus) is allowed on pointers. */
- if (code == CONVERT_EXPR)
- flags |= WANT_POINTER;
- arg = build_expr_type_conversion (flags, arg, true);
+ {
+ int flags = WANT_ARITH | WANT_ENUM;
+ /* Unary plus (but not unary minus) is allowed on pointers. */
+ if (code == CONVERT_EXPR)
+ flags |= WANT_POINTER;
+ arg = build_expr_type_conversion (flags, arg, true);
if (!arg)
errstring = (code == NEGATE_EXPR
? "wrong type argument to unary minus"