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 | 675431d5a8b6aed1bd7322aa2da5cd8eb0ae76b7 (patch) | |
| tree | b6fb651e12da1397a3646795309f9a3b8a33e388 /lib/Parse/ParseDecl.cpp | |
| parent | c1daae3d17fa98a7d8bcc6089083c68e7f368525 (diff) | |
Parsing fix for out-of-line constructors, from Piotr Rak
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74833 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDecl.cpp')
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index d599438644..5566751fb9 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/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 |