Renamed getCatLoc() to getLocation() to be consistant for such

getter names.

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

diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp
index 69e8b832a577e088c4aeb0ff5b9e63634cc9bad4..3aaa112e02ed7410684e579931c14bf95aed921e 100644 (file)
--- a/Sema/SemaDecl.cpp
+++ b/Sema/SemaDecl.cpp
@@ -1339,7 +1339,7 @@ void Sema::ImplCategoryMethodsVsIntfMethods(ObjcCategoryImplDecl *CatImplDecl,
     CheckProtocolMethodDefs(PDecl, IncompleteImpl, InsMap, ClsMap);
   }
   if (IncompleteImpl)
-    Diag(CatClassDecl->getCatLoc(), diag::warn_incomplete_impl_category, 
+    Diag(CatClassDecl->getLocation(), diag::warn_incomplete_impl_category, 
          CatClassDecl->getCatName()->getName());
 }
 

diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index 314ed3ea3cf698d8d382b2bd0ea6ae5b1523a2b3..6389e5fbc4b52a5bf259edca2edaf14c4c7a7ad6 100644 (file)
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -737,6 +737,7 @@
                08FB7793FE84155DC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 08FB7794FE84155DC02AAC07 /* clang */;
                        projectDirPath = "";

diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index 7fb438d79f7aa51558478c31cf7306343b6f105b..5010cae1243f74a2160de8c03d193c028d4df51e 100644 (file)
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -477,7 +477,7 @@ public:
     ClassInterface->setListCategories(this);
   }
   
-  SourceLocation getCatLoc() const { return CatLoc; }
+  SourceLocation getLocation() const { return CatLoc; }
   
   static bool classof(const Decl *D) {
     return D->getKind() == ObjcCategory;