summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaTemplateInstantiateDecl.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/Sema/SemaTemplateInstantiateDecl.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/Sema/SemaTemplateInstantiateDecl.cpp')
-rw-r--r--clang/lib/Sema/SemaTemplateInstantiateDecl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 1d4f3359ed0..8d8cda115d1 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1316,13 +1316,15 @@ TemplateDeclInstantiator::VisitCXXMethodDecl(CXXMethodDecl *D,
Method = CXXConversionDecl::Create(SemaRef.Context, Record,
StartLoc, NameInfo, T, TInfo,
Conversion->isInlineSpecified(),
- Conversion->isExplicit());
+ Conversion->isExplicit(),
+ Conversion->getLocEnd());
} else {
Method = CXXMethodDecl::Create(SemaRef.Context, Record,
StartLoc, NameInfo, T, TInfo,
D->isStatic(),
D->getStorageClassAsWritten(),
- D->isInlineSpecified());
+ D->isInlineSpecified(),
+ D->getLocEnd());
}
if (QualifierLoc)
OpenPOWER on IntegriCloud