From: R. Kelley Cook <kcook@gcc.gnu.org>
Date: Wed, 28 Jul 2004 02:17:28 +0000 (+0000)
Subject: CRLF -> CR correction
X-Git-Tag: releases/gcc-3.3.5~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ea72ddac7c6551163a323876b1bb784177c8e0;p=thirdparty%2Fgcc.git

CRLF -> CR correction

From-SVN: r85246
---

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 313460b69845..727698a0d106 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4328,20 +4328,20 @@ convert_arg_to_ellipsis (arg)
 
   arg = require_complete_type (arg);
   
-  if (arg != error_mark_node
-      && !pod_type_p (TREE_TYPE (arg)))
-    {
-      /* Undefined behavior [expr.call] 5.2.2/7.  We used to just warn
-	 here and do a bitwise copy, but now cp_expr_size will abort if we
-	 try to do that.
-	 If the call appears in the context of a sizeof expression,
-	 there is no need to emit a warning, since the expression won't be
-	 evaluated. We keep the builtin_trap just as a safety check.  */
-      if (!skip_evaluation)
-	warning ("cannot pass objects of non-POD type `%#T' through `...'; "
-		 "call will abort at runtime", TREE_TYPE (arg));
-      arg = call_builtin_trap ();
-    }
+  if (arg != error_mark_node
+      && !pod_type_p (TREE_TYPE (arg)))
+    {
+      /* Undefined behavior [expr.call] 5.2.2/7.  We used to just warn
+	 here and do a bitwise copy, but now cp_expr_size will abort if we
+	 try to do that.
+	 If the call appears in the context of a sizeof expression,
+	 there is no need to emit a warning, since the expression won't be
+	 evaluated. We keep the builtin_trap just as a safety check.  */
+      if (!skip_evaluation)
+	warning ("cannot pass objects of non-POD type `%#T' through `...'; "
+		 "call will abort at runtime", TREE_TYPE (arg));
+      arg = call_builtin_trap ();
+    }
 
   return arg;
 }
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7cdf89352711..dfdeb1e51712 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4940,10 +4940,10 @@ push_overloaded_decl (decl, flags)
     }
 
   if (old || TREE_CODE (decl) == TEMPLATE_DECL
-      /* If it's a using declaration, we always need to build an OVERLOAD,
-	 because it's the only way to remember that the declaration comes
-	 from 'using', and have the lookup behave correctly.  */
-      || (flags & PUSH_USING))
+      /* If it's a using declaration, we always need to build an OVERLOAD,
+	 because it's the only way to remember that the declaration comes
+	 from 'using', and have the lookup behave correctly.  */
+      || (flags & PUSH_USING))
     {
       if (old && TREE_CODE (old) != OVERLOAD)
 	new_binding = ovl_cons (decl, ovl_cons (old, NULL_TREE));
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 5a408030d7d9..f2959b6c808b 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -3123,8 +3123,8 @@ build_delete (type, addr, auto_delete, flags, use_global_delete)
 	      warning ("possible problem detected in invocation of "
 		       "delete operator:");
 	      cxx_incomplete_type_diagnostic (addr, type, 1);
-	      inform ("neither the destructor nor the class-specific "
-		      "operator delete will be called, even if they are "
+	      inform ("neither the destructor nor the class-specific "
+		      "operator delete will be called, even if they are "
 		      "declared when the class is defined.");
 	      complete_p = false;
 	    }