commit c30493db3c7c3ef32dbd3824d6864007a18fbd6c
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Oct 18 18:33:57 2011 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Oct 18 18:33:57 2011 +0000
tree 9acf5c3323e8107fadb21330f2fd2fa822f15a27
parent 9e320909f5cac99268df2348fda135d9cf636551

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

llvm-svn: 142393

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index a39584a..38bce96 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -10045,7 +10045,7 @@
 
     // 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()) {