Move ASTLocation and DeclReferenceMap from the AST library to the Index library.

llvm-svn: 74859

3 files changed, 9 insertions, 6 deletions

diff --git a/clang/lib/Frontend/ResolveLocation.cpp b/clang/lib/Frontend/ResolveLocation.cpp
index c2d32bbc90b..9fbae30a485 100644
--- a/clang/lib/Frontend/ResolveLocation.cpp
+++ b/clang/lib/Frontend/ResolveLocation.cpp
@@ -13,13 +13,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Frontend/Utils.h"
-#include "clang/AST/ASTLocation.h"
+#include "clang/Index/ASTLocation.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Lex/Lexer.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/Support/Compiler.h"
 using namespace clang;
+using namespace idx;
 
 namespace {
 
diff --git a/clang/lib/AST/ASTLocation.cpp b/clang/lib/Index/ASTLocation.cpp
index e72acf07935..4b95d9d5542 100644
--- a/clang/lib/AST/ASTLocation.cpp
+++ b/clang/lib/Index/ASTLocation.cpp
@@ -1,4 +1,4 @@
-//===--- ASTLocation.h - A <Decl, Stmt> pair --------------------*- C++ -*-===//
+//===--- ASTLocation.cpp - A <Decl, Stmt> pair ------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,11 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/AST/ASTLocation.h"
+#include "clang/Index/ASTLocation.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Stmt.h"
 #include "clang/AST/Expr.h"
 using namespace clang;
+using namespace idx;
 
 static bool isContainedInStatement(Stmt *Node, Stmt *Parent) {
   assert(Node && Parent && "Passed null Node or Parent");
diff --git a/clang/lib/AST/DeclReferenceMap.cpp b/clang/lib/Index/DeclReferenceMap.cpp
index 41f53fdd524..841d7fb2fb7 100644
--- a/clang/lib/AST/DeclReferenceMap.cpp
+++ b/clang/lib/Index/DeclReferenceMap.cpp
@@ -1,4 +1,4 @@
-//===--- DeclReferenceMap.h - Map Decls to their references -----*- C++ -*-===//
+//===--- DeclReferenceMap.cpp - Map Decls to their references ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,14 +12,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/AST/DeclReferenceMap.h"
+#include "clang/Index/DeclReferenceMap.h"
+#include "clang/Index/ASTLocation.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Stmt.h"
-#include "clang/AST/ASTLocation.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/StmtVisitor.h"
 #include "llvm/Support/Compiler.h"
 using namespace clang;
+using namespace idx;
 
 namespace {