diff options
| author | Steve Naroff <snaroff@apple.com> | 2008-08-28 10:07:06 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2008-08-28 10:07:06 +0000 |
| commit | 94e3ab20b78b7e4563717d9117f6a94a1942149e (patch) | |
| tree | 3b95b85e17f263af3001c7c645739e58b6e1ab7e /clang/lib/Parse | |
| parent | 69756020245174e3e5f9d611e065f3fcd0ceb8ac (diff) | |
| download | bcm5719-llvm-94e3ab20b78b7e4563717d9117f6a94a1942149e.tar.gz bcm5719-llvm-94e3ab20b78b7e4563717d9117f6a94a1942149e.zip | |
Fix Parser::ParseDeclaratorInternal(): add langopts test when recognizing blocks.
llvm-svn: 55468
Diffstat (limited to 'clang/lib/Parse')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 76fca9e885f..cd2dda2941e 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -1116,10 +1116,10 @@ void Parser::ParseDeclaratorInternal(Declarator &D) { (Kind != tok::caret || !getLang().Blocks)) return ParseDirectDeclarator(D); - // Otherwise, '*' -> pointer or '&' -> reference. + // Otherwise, '*' -> pointer, '^' -> block, '&' -> reference. SourceLocation Loc = ConsumeToken(); // Eat the * or &. - if (Kind == tok::star || Kind == tok::caret) { + if (Kind == tok::star || (Kind == tok::caret && getLang().Blocks)) { // Is a pointer. DeclSpec DS; |
