summaryrefslogtreecommitdiffstats
path: root/lib/Index
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Index')
-rw-r--r--lib/Index/Entity.cpp8
-rw-r--r--lib/Index/GlobalSelector.cpp8
-rw-r--r--lib/Index/Makefile4
3 files changed, 6 insertions, 14 deletions
diff --git a/lib/Index/Entity.cpp b/lib/Index/Entity.cpp
index 03fe9f7..cd9d277 100644
--- a/lib/Index/Entity.cpp
+++ b/lib/Index/Entity.cpp
@@ -71,9 +71,7 @@ Entity EntityGetter::VisitNamedDecl(NamedDecl *D) {
DeclarationName GlobName;
if (IdentifierInfo *II = LocalName.getAsIdentifierInfo()) {
- IdentifierInfo *GlobII =
- &ProgImpl.getIdents().get(II->getNameStart(),
- II->getNameStart() + II->getLength());
+ IdentifierInfo *GlobII = &ProgImpl.getIdents().get(II->getName());
GlobName = DeclarationName(GlobII);
} else {
Selector LocalSel = LocalName.getObjCSelector();
@@ -140,9 +138,7 @@ Decl *EntityImpl::getDecl(ASTContext &AST) {
DeclarationName LocalName;
if (IdentifierInfo *GlobII = Name.getAsIdentifierInfo()) {
- IdentifierInfo &II =
- AST.Idents.get(GlobII->getNameStart(),
- GlobII->getNameStart() + GlobII->getLength());
+ IdentifierInfo &II = AST.Idents.get(GlobII->getName());
LocalName = DeclarationName(&II);
} else {
Selector GlobSel = Name.getObjCSelector();
diff --git a/lib/Index/GlobalSelector.cpp b/lib/Index/GlobalSelector.cpp
index 2b2ca6d..3467918 100644
--- a/lib/Index/GlobalSelector.cpp
+++ b/lib/Index/GlobalSelector.cpp
@@ -29,9 +29,7 @@ Selector GlobalSelector::getSelector(ASTContext &AST) const {
for (unsigned i = 0, e = GlobSel.isUnarySelector() ? 1 : GlobSel.getNumArgs();
i != e; ++i) {
IdentifierInfo *GlobII = GlobSel.getIdentifierInfoForSlot(i);
- IdentifierInfo *II =
- &AST.Idents.get(GlobII->getNameStart(),
- GlobII->getNameStart() + GlobII->getLength());
+ IdentifierInfo *II = &AST.Idents.get(GlobII->getName());
Ids.push_back(II);
}
@@ -58,9 +56,7 @@ GlobalSelector GlobalSelector::get(Selector Sel, Program &Prog) {
for (unsigned i = 0, e = Sel.isUnarySelector() ? 1 : Sel.getNumArgs();
i != e; ++i) {
IdentifierInfo *II = Sel.getIdentifierInfoForSlot(i);
- IdentifierInfo *GlobII =
- &ProgImpl.getIdents().get(II->getNameStart(),
- II->getNameStart() + II->getLength());
+ IdentifierInfo *GlobII = &ProgImpl.getIdents().get(II->getName());
Ids.push_back(GlobII);
}
diff --git a/lib/Index/Makefile b/lib/Index/Makefile
index 9d33a2d..4d86713 100644
--- a/lib/Index/Makefile
+++ b/lib/Index/Makefile
@@ -18,10 +18,10 @@ LIBRARYNAME := clangIndex
BUILD_ARCHIVE = 1
ifeq ($(ARCH),PowerPC)
-CXXFLAGS += -maltivec
+CXX.Flags += -maltivec
endif
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
include $(LEVEL)/Makefile.common
OpenPOWER on IntegriCloud