diff mbox

[C++] PR 50344

Message ID 4E79FEF9.7080704@oracle.com
State New
Headers show

Commit Message

Paolo Carlini Sept. 21, 2011, 3:12 p.m. UTC 
Hi,

basing on [class.friend] (11.3/3) in C++11 I think Jon is right that 
cv-qualification should be ok in a friend declaration. I'm not sure, 
however, if we want to somehow allow that also in c++98 mode... Tested 
x86_64-linux.

Ok?

Thanks,
Paolo.

///////////////////
/cp
2011-09-21  Paolo Carlini  <paolo.carlini@oracle.com>
	    Jonathan Wakely  <jwakely.gcc@gmail.com>

	PR c++/50344
	* friend.c (make_friend_class): In c++0x mode, cv-qualification is
	ok in a friend declaration.

/cp
2011-09-21  Paolo Carlini  <paolo.carlini@oracle.com>
	    Jonathan Wakely  <jwakely.gcc@gmail.com>

	PR c++/50344
	* g++.dg/cpp0x/friend3.C: New.

Comments

Jason Merrill Sept. 21, 2011, 4:55 p.m. UTC | #1 
On 09/21/2011 11:12 AM, Paolo Carlini wrote:
> basing on [class.friend] (11.3/3) in C++11 I think Jon is right that
> cv-qualification should be ok in a friend declaration. I'm not sure,
> however, if we want to somehow allow that also in c++98 mode...

I think we do.

Jason
diff mbox

Patch

Index: testsuite/g++.dg/cpp0x/friend3.C
===================================================================
--- testsuite/g++.dg/cpp0x/friend3.C	(revision 0)
+++ testsuite/g++.dg/cpp0x/friend3.C	(revision 0)
@@ -0,0 +1,17 @@ 
+// PR c++/50344
+// { dg-options -std=c++0x }
+
+template <typename T> class C
+{
+   friend T;
+   int i;
+};
+
+struct S
+{
+    int f()
+    {
+       C<const S> c;
+       return c.i;
+    }
+};
Index: cp/friend.c
===================================================================
--- cp/friend.c	(revision 179049)
+++ cp/friend.c	(working copy)
@@ -1,6 +1,6 @@ 
 /* Help friends in C++.
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2007, 2008, 2010  Free Software Foundation, Inc.
+   2007, 2008, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -236,6 +236,8 @@  make_friend_class (tree type, tree friend_type, bo
 		 "invalid type %qT declared %<friend%>", friend_type);
       return;
     }
+  else if (cxx_dialect >= cxx0x)
+    friend_type = cv_unqualified (friend_type);
 
   if (friend_depth)
     /* If the TYPE is a template then it makes sense for it to be