diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-18 18:33:57 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-18 18:33:57 +0000 |
| commit | c30493db3c7c3ef32dbd3824d6864007a18fbd6c (patch) | |
| tree | 9acf5c3323e8107fadb21330f2fd2fa822f15a27 /clang/lib | |
| parent | 9e320909f5cac99268df2348fda135d9cf636551 (diff) | |
| download | bcm5719-llvm-c30493db3c7c3ef32dbd3824d6864007a18fbd6c.tar.gz bcm5719-llvm-c30493db3c7c3ef32dbd3824d6864007a18fbd6c.zip | |
In C++11, a class's members are allowed to be nominated as friends.
llvm-svn: 142393
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index a39584a107a..38bce96360c 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -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()) { |
