[cfe-commits] r172865 - /cfe/trunk/lib/Sema/SemaDeclCXX.cpp

[David Blaikie]

Author: dblaikie
Date: Fri Jan 18 17:03:15 2013
New Revision: 172865

URL: http://llvm.org/viewvc/llvm-project?rev=172865&view=rev
Log:
Remove windows line endings.

Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=172865&r1=172864&r2=172865&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Fri Jan 18 17:03:15 2013
@@ -10917,7 +10917,7 @@
   }
 }
 
-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 @@
 
   // 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;