summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDecl.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/SemaDecl.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/SemaDecl.cpp')
-rw-r--r--clang/lib/Sema/SemaDecl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 978e7a2e1e9..28ae04aea5b 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3711,7 +3711,8 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
NewFD = CXXConversionDecl::Create(Context, cast<CXXRecordDecl>(DC),
D.getSourceRange().getBegin(),
NameInfo, R, TInfo,
- isInline, isExplicit);
+ isInline, isExplicit,
+ SourceLocation());
isVirtualOkay = true;
} else if (DC->isRecord()) {
@@ -3747,7 +3748,8 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
NewFD = CXXMethodDecl::Create(Context, cast<CXXRecordDecl>(DC),
D.getSourceRange().getBegin(),
NameInfo, R, TInfo,
- isStatic, SCAsWritten, isInline);
+ isStatic, SCAsWritten, isInline,
+ SourceLocation());
isVirtualOkay = !isStatic;
} else {
OpenPOWER on IntegriCloud