summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2012-05-22 21:28:07 +0000
committerJohn McCall <rjmccall@apple.com>2012-05-22 21:28:07 +0000
commitfa6cf4cc9af67618b8064cc6d7cd1074d371942f (patch)
tree0e9ad4ac32f80c03972b75951185edf82fd1c1f7 /clang
parent6c26f0b2a7ee3a74fac538c38453ecc581bd0536 (diff)
downloadbcm5719-llvm-fa6cf4cc9af67618b8064cc6d7cd1074d371942f.tar.gz
bcm5719-llvm-fa6cf4cc9af67618b8064cc6d7cd1074d371942f.zip
Fix line endings.
llvm-svn: 157287
Diffstat (limited to 'clang')
-rw-r--r--clang/test/Parser/MicrosoftExtensions.cpp41
1 files changed, 18 insertions, 23 deletions
diff --git a/clang/test/Parser/MicrosoftExtensions.cpp b/clang/test/Parser/MicrosoftExtensions.cpp
index 351fa73588f..94047884d6b 100644
--- a/clang/test/Parser/MicrosoftExtensions.cpp
+++ b/clang/test/Parser/MicrosoftExtensions.cpp
@@ -297,28 +297,23 @@ int main () {
missing_template_keyword<int>();
}
+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;
+ }
+}
OpenPOWER on IntegriCloud