diff options
author | John McCall <rjmccall@apple.com> | 2010-10-20 08:15:06 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2010-10-20 08:15:06 +0000 |
commit | aa56a66abb61e9f42b48ae88e43328aba10c9148 (patch) | |
tree | c1f6c01f26ef2a78c70244b260bb5bdc28e401de /test/CXX/class.access/class.friend/p1.cpp | |
parent | 6b40195e035e4b76705126ef53bad446153dd3f8 (diff) |
Access control polish: drop the note on the original declaration and
say 'implicitly' when it was implicit. Resolves PR 7930 and my peace of mind.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116916 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX/class.access/class.friend/p1.cpp')
-rw-r--r-- | test/CXX/class.access/class.friend/p1.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/CXX/class.access/class.friend/p1.cpp b/test/CXX/class.access/class.friend/p1.cpp index 277b70bee6..761643b7d7 100644 --- a/test/CXX/class.access/class.friend/p1.cpp +++ b/test/CXX/class.access/class.friend/p1.cpp @@ -258,13 +258,12 @@ namespace test7 { namespace test8 { class A { typedef int I; // expected-note 4 {{declared private here}} - static const I x = 0; + static const I x = 0; // expected-note {{implicitly declared private here}} friend I f(I i); template<typename T> friend I g(I i); }; - // FIXME: This should be on line 264. - const A::I A::x; // expected-note {{declared private here}} + const A::I A::x; A::I f(A::I i = A::x) {} template<typename T> A::I g(A::I i) { T t; |