Remove windows line endings.

llvm-svn: 172865

1 files changed, 6 insertions, 6 deletions

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 61d8dfce5fc..515fd91a6b8 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/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;