From: David Blaikie <dblaikie@gmail.com>
Date: Fri, 18 Jan 2013 23:03:15 +0000 (+0000)
Subject: Remove windows line endings.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=299adab3e2033e9addc1df4544d8486fc596c6ff;p=clang

Remove windows line endings.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172865 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 61d8dfce5f..515fd91a6b 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -10917,7 +10917,7 @@ void Sema::DiagnoseReturnInConstructorExceptionHandler(CXXTryStmt *TryBlock) {
   }
 }
 
-bool Sema::CheckOverridingFunctionAttributes(const CXXMethodDecl *New,
+bool Sema::CheckOverridingFunctionAttributes(const CXXMethodDecl *New,
                                              const CXXMethodDecl *Old) {
   const FunctionType *NewFT = New->getType()->getAs<FunctionType>();
   const FunctionType *OldFT = Old->getType()->getAs<FunctionType>();
@@ -10941,11 +10941,11 @@ bool Sema::CheckOverridingFunctionAttributes(const CXXMethodDecl *New,
 
   // If the calling conventions still don't match, then report the error
   if (NewCC != OldCC) {
-    Diag(New->getLocation(),
-         diag::err_conflicting_overriding_cc_attributes)
-      << New->getDeclName() << New->getType() << Old->getType();
-    Diag(Old->getLocation(), diag::note_overridden_virtual_function);
-    return true;
+    Diag(New->getLocation(),
+         diag::err_conflicting_overriding_cc_attributes)
+      << New->getDeclName() << New->getType() << Old->getType();
+    Diag(Old->getLocation(), diag::note_overridden_virtual_function);
+    return true;
   }
 
   return false;