diff options
| author | Reid Kleckner <rnk@google.com> | 2016-03-17 20:06:58 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-03-17 20:06:58 +0000 |
| commit | 4084504caac224362f918a8b74a747dd8c1fdd0f (patch) | |
| tree | 7bb752f4097adc7e1fa4e5f46e69705b54c827a6 /clang/lib/Parse/ParseCXXInlineMethods.cpp | |
| parent | c5575aabd62d2dc6ad74d03d0b49cc40dcb19b1e (diff) | |
| download | bcm5719-llvm-4084504caac224362f918a8b74a747dd8c1fdd0f.tar.gz bcm5719-llvm-4084504caac224362f918a8b74a747dd8c1fdd0f.zip | |
Revert "For MS ABI, emit dllexport friend functions defined inline in class"
This reverts commit r263738.
This appears to cause a failure in
CXX/temp/temp.decls/temp.friend/p1.cpp
llvm-svn: 263740
Diffstat (limited to 'clang/lib/Parse/ParseCXXInlineMethods.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseCXXInlineMethods.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index 3db75c7ee79..07e32b7e42c 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -564,10 +564,8 @@ void Parser::ParseLexedMethodDef(LexedMethod &LM) { if (Tok.is(tok::eof) && Tok.getEofData() == LM.D) ConsumeAnyToken(); - if (auto *FD = dyn_cast_or_null<FunctionDecl>(LM.D)) - if (isa<CXXMethodDecl>(FD) || - FD->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend)) - Actions.ActOnFinishInlineFunctionDef(FD); + if (CXXMethodDecl *MD = dyn_cast_or_null<CXXMethodDecl>(LM.D)) + Actions.ActOnFinishInlineMethodDef(MD); } /// ParseLexedMemberInitializers - We finished parsing the member specification |
