maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

In C++11, a class's members are allowed to be nominated as friends. 

llvm-svn: 142393
This commit is contained in:
Richard Smith 2011-10-18 18:33:57 +00:00
parent 9e320909f5
commit c30493db3c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -10045,7 +10045,7 @@ Decl *Sema::ActOnFriendFunctionDecl(Scope *S, Declarator &D,
// C++ [class.friend]p1: A friend of a class is a function or
// class that is not a member of the class . . .
if (DC->Equals(CurContext))
if (DC->Equals(CurContext) && !getLangOptions().CPlusPlus0x)
Diag(DS.getFriendSpecLoc(), diag::err_friend_is_member);
if (D.isFunctionDefinition()) {

12
clang/test/CXX/class/class.friend/p1-cxx11.cpp Normal file
View File

@ -0,0 +1,12 @@
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
class A {
class AInner {
};
void a_member();
friend void A::a_member(); // ok in c++11, ill-formed in c++98
friend void a_member(); // ok in both, refers to non-member
friend class A::AInner; // ok in c++11, extension in c++98
friend class AInner; // ok in both, refers to non-member
};