From 6c20222da814df4cb1ef97681f0e1e8cb5a01b40 Mon Sep 17 00:00:00 2001 From: John McCall Date: Tue, 22 May 2012 21:28:07 +0000 Subject: Fix line endings. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@157287 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Parser/MicrosoftExtensions.cpp | 41 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 23 deletions(-) (limited to 'test/Parser/MicrosoftExtensions.cpp') diff --git a/test/Parser/MicrosoftExtensions.cpp b/test/Parser/MicrosoftExtensions.cpp index 351fa73588..94047884d6 100644 --- a/test/Parser/MicrosoftExtensions.cpp +++ b/test/Parser/MicrosoftExtensions.cpp @@ -297,28 +297,23 @@ int main () { missing_template_keyword(); } +namespace access_protected_PTM { + class A { + protected: + void f(); // expected-note {{must name member using the type of the current context 'access_protected_PTM::B'}} + }; + class B : public A{ + public: + void test_access(); + static void test_access_static(); + }; - -namespace access_protected_PTM { - -class A { -protected: - void f(); // expected-note {{must name member using the type of the current context 'access_protected_PTM::B'}} -}; - -class B : public A{ -public: - void test_access(); - static void test_access_static(); -}; - -void B::test_access() { - &A::f; // expected-error {{'f' is a protected member of 'access_protected_PTM::A'}} -} - -void B::test_access_static() { - &A::f; -} - -} \ No newline at end of file + void B::test_access() { + &A::f; // expected-error {{'f' is a protected member of 'access_protected_PTM::A'}} + } + + void B::test_access_static() { + &A::f; + } +} -- cgit v1.2.1