diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2013-06-29 08:38:42 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2013-06-29 08:38:42 +0000 |
| commit | 32d1e730237cd925cddaec6af67d85204080301d (patch) | |
| tree | 1ee2cb2994e13c40af663786a24027d741b398c7 /clang/test/CXX/class.access/class.friend/p1.cpp | |
| parent | 243e53977a1af98b593b65b70722e6890a8b6d88 (diff) | |
| download | bcm5719-llvm-32d1e730237cd925cddaec6af67d85204080301d.tar.gz bcm5719-llvm-32d1e730237cd925cddaec6af67d85204080301d.zip | |
Revert r185229 as it breaks compilation of <windows.h>
llvm-svn: 185256
Diffstat (limited to 'clang/test/CXX/class.access/class.friend/p1.cpp')
| -rw-r--r-- | clang/test/CXX/class.access/class.friend/p1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/test/CXX/class.access/class.friend/p1.cpp b/clang/test/CXX/class.access/class.friend/p1.cpp index 1a519dcc3e5..19d94cfdd5f 100644 --- a/clang/test/CXX/class.access/class.friend/p1.cpp +++ b/clang/test/CXX/class.access/class.friend/p1.cpp @@ -287,22 +287,22 @@ namespace test9 { // PR7230 namespace test10 { - extern "C" void test10_f(void); - extern "C" void test10_g(void); + extern "C" void f(void); + extern "C" void g(void); namespace NS { class C { void foo(void); // expected-note {{declared private here}} - friend void test10::test10_f(void); + friend void test10::f(void); }; static C* bar; } - void test10_f(void) { + void f(void) { NS::bar->foo(); } - void test10_g(void) { + void g(void) { NS::bar->foo(); // expected-error {{private member}} } } |

