From 4084504caac224362f918a8b74a747dd8c1fdd0f Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 17 Mar 2016 20:06:58 +0000 Subject: 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 --- clang/lib/Parse/ParseCXXInlineMethods.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'clang/lib/Parse/ParseCXXInlineMethods.cpp') 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(LM.D)) - if (isa(FD) || - FD->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend)) - Actions.ActOnFinishInlineFunctionDef(FD); + if (CXXMethodDecl *MD = dyn_cast_or_null(LM.D)) + Actions.ActOnFinishInlineMethodDef(MD); } /// ParseLexedMemberInitializers - We finished parsing the member specification -- cgit v1.2.3