typeck.c: Remove DOS line endings.

2004-12-08  Kelley Cook  <kcook@gcc.gnu.org>

	* typeck.c: Remove DOS line endings.

From-SVN: r91919

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 13cfc69426d7fe402abb72a4139cd0b1787cf912..d37b9631dfd7db36e5bcba375b5d15dc9211fba1 100644 (file)
--- 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 a06101c42f00a2311c761b40afd1a6c1dff26b8a..a26bff4b56108f1e8c68be3f08c9bf8ee247445d 100644 (file)
--- 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:
-      {\r
-       int flags = WANT_ARITH | WANT_ENUM;\r
-       /* Unary plus (but not unary minus) is allowed on pointers.  */\r
-       if (code == CONVERT_EXPR)\r
-         flags |= WANT_POINTER;\r
-       arg = build_expr_type_conversion (flags, arg, true);\r
+      {
+       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"