]> granicus.if.org Git - clang/commitdiff
Remove windows line endings.
authorDavid Blaikie <dblaikie@gmail.com>
Fri, 18 Jan 2013 23:03:15 +0000 (23:03 +0000)
committerDavid Blaikie <dblaikie@gmail.com>
Fri, 18 Jan 2013 23:03:15 +0000 (23:03 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172865 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaDeclCXX.cpp

index 61d8dfce5fc8300f7aea775ce107da1536226474..515fd91a6b83495bd10ef94dbef0b16a1b4500bc 100644 (file)
@@ -10917,7 +10917,7 @@ void Sema::DiagnoseReturnInConstructorExceptionHandler(CXXTryStmt *TryBlock) {
   }
 }
 
-bool Sema::CheckOverridingFunctionAttributes(const CXXMethodDecl *New,\r
+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(),\r
-         diag::err_conflicting_overriding_cc_attributes)\r
-      << New->getDeclName() << New->getType() << Old->getType();\r
-    Diag(Old->getLocation(), diag::note_overridden_virtual_function);\r
-    return true;\r
+    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;