diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-07-06 16:40:48 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-07-06 16:40:48 +0000 |
| commit | dce892e12822b91c9ae759ee7d7054f034a1d652 (patch) | |
| tree | 97ef8ab9316d61c96783b7f1073ffda8cd31df19 /clang/lib | |
| parent | 9d243d47dde39208775ce48173ebd7ec1780fe6b (diff) | |
| download | bcm5719-llvm-dce892e12822b91c9ae759ee7d7054f034a1d652.tar.gz bcm5719-llvm-dce892e12822b91c9ae759ee7d7054f034a1d652.zip | |
Parsing fix for out-of-line constructors, from Piotr Rak
llvm-svn: 74833
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index d5994386440..5566751fb99 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -2125,8 +2125,9 @@ void Parser::ParseDirectDeclarator(Declarator &D) { // constructor name. if (!D.getDeclSpec().hasTypeSpecifier() && Actions.isCurrentClassName(*Tok.getIdentifierInfo(),CurScope)) { + CXXScopeSpec *SS = afterCXXScope? &D.getCXXScopeSpec() : 0; D.setConstructor(Actions.getTypeName(*Tok.getIdentifierInfo(), - Tok.getLocation(), CurScope), + Tok.getLocation(), CurScope, SS), Tok.getLocation()); // This is a normal identifier. } else @@ -2171,7 +2172,8 @@ void Parser::ParseDirectDeclarator(Declarator &D) { // FIXME: Inaccurate. SourceLocation NameLoc = Tok.getLocation(); SourceLocation EndLoc; - TypeResult Type = ParseClassName(EndLoc); + CXXScopeSpec *SS = afterCXXScope? &D.getCXXScopeSpec() : 0; + TypeResult Type = ParseClassName(EndLoc, SS); if (Type.isInvalid()) D.SetIdentifier(0, TildeLoc); else |
