summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/ASTImporter.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-03-08 17:10:18 +0000
committerDouglas Gregor <dgregor@apple.com>2011-03-08 17:10:18 +0000
commitf2f0806f717a7646d1065eea20f6359f7fb4a69b (patch)
treeed63903ba9c26b2f97bb298e83f41c5b3fe93a82 /clang/lib/AST/ASTImporter.cpp
parentc7b48d40d4629251858566070372aa1aeb72b957 (diff)
downloadbcm5719-llvm-f2f0806f717a7646d1065eea20f6359f7fb4a69b.tar.gz
bcm5719-llvm-f2f0806f717a7646d1065eea20f6359f7fb4a69b.zip
Teach libclang's token-annotation logic about context-sensitive
keywords for Objective-C+ and C++0x. llvm-svn: 127253
Diffstat (limited to 'clang/lib/AST/ASTImporter.cpp')
-rw-r--r--clang/lib/AST/ASTImporter.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index f3bb5d1415e..89488deaa3e 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -2389,7 +2389,8 @@ Decl *ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) {
D->getInnerLocStart(),
NameInfo, T, TInfo,
D->isInlineSpecified(),
- FromConversion->isExplicit());
+ FromConversion->isExplicit(),
+ Importer.Import(D->getLocEnd()));
} else if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(D)) {
ToFunction = CXXMethodDecl::Create(Importer.getToContext(),
cast<CXXRecordDecl>(DC),
@@ -2397,7 +2398,8 @@ Decl *ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) {
NameInfo, T, TInfo,
Method->isStatic(),
Method->getStorageClassAsWritten(),
- Method->isInlineSpecified());
+ Method->isInlineSpecified(),
+ Importer.Import(D->getLocEnd()));
} else {
ToFunction = FunctionDecl::Create(Importer.getToContext(), DC,
D->getInnerLocStart(),
OpenPOWER on IntegriCloud