Convert file from 60% unix 40% dos line endings to 100% unix line endings.

No other changes.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148678 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 67 insertions, 67 deletions

diff --git a/test/SemaCXX/MicrosoftCompatibility.cpp b/test/SemaCXX/MicrosoftCompatibility.cpp
index 9547a275f8..90a7ff731c 100644
--- a/test/SemaCXX/MicrosoftCompatibility.cpp
+++ b/test/SemaCXX/MicrosoftCompatibility.cpp
@@ -91,75 +91,75 @@ namespace PR11826_for_symmetry {
   }
 }
 
-namespace ms_using_declaration_bug {

-

-class A {

-public: 

-  int f(); 

-};

-

-class B : public A {

-private:   

-  using A::f;

-};

-

-class C : public B { 

-private:   

-  using B::f; // expected-warning {{using declaration referring to inaccessible member 'ms_using_declaration_bug::B::f' (which refers to accessible member 'ms_using_declaration_bug::A::f') is a Microsoft compatibility extension}}

-};

-

-}

-

-

-namespace MissingTypename {

-

-template<class T> class A {

-public:

-	 typedef int TYPE;

-};

-

-template<class T> class B {

-public:

-	 typedef int TYPE;

-};

-

-

-template<class T, class U>

-class C : private A<T>, public B<U> {

-public:

-   typedef A<T> Base1;

-   typedef B<U> Base2;

-   typedef A<U> Base3;

-

-   A<T>::TYPE a1; // expected-warning {{missing 'typename' prior to dependent type name}}

-   Base1::TYPE a2; // expected-warning {{missing 'typename' prior to dependent type name}}

-

-   B<U>::TYPE a3; // expected-warning {{missing 'typename' prior to dependent type name}}

-   Base2::TYPE a4; // expected-warning {{missing 'typename' prior to dependent type name}}

-

-   A<U>::TYPE a5; // expected-error {{missing 'typename' prior to dependent type name}}

-   Base3::TYPE a6; // expected-error {{missing 'typename' prior to dependent type name}}

- };

-

-class D {

-public:

-    typedef int Type;

-};

-

-template <class T>

-void function_missing_typename(const T::Type param)// expected-warning {{missing 'typename' prior to dependent type name}}

-{

-    const T::Type var = 2; // expected-warning {{missing 'typename' prior to dependent type name}}

-}

-

-template void function_missing_typename<D>(const D::Type param);

-

-}

-

+namespace ms_using_declaration_bug {
+
+class A {
+public: 
+  int f(); 
+};
+
+class B : public A {
+private:   
+  using A::f;
+};
+
+class C : public B { 
+private:   
+  using B::f; // expected-warning {{using declaration referring to inaccessible member 'ms_using_declaration_bug::B::f' (which refers to accessible member 'ms_using_declaration_bug::A::f') is a Microsoft compatibility extension}}
+};
+
+}
+
+
+namespace MissingTypename {
+
+template<class T> class A {
+public:
+	 typedef int TYPE;
+};
+
+template<class T> class B {
+public:
+	 typedef int TYPE;
+};
+
+
+template<class T, class U>
+class C : private A<T>, public B<U> {
+public:
+   typedef A<T> Base1;
+   typedef B<U> Base2;
+   typedef A<U> Base3;
+
+   A<T>::TYPE a1; // expected-warning {{missing 'typename' prior to dependent type name}}
+   Base1::TYPE a2; // expected-warning {{missing 'typename' prior to dependent type name}}
+
+   B<U>::TYPE a3; // expected-warning {{missing 'typename' prior to dependent type name}}
+   Base2::TYPE a4; // expected-warning {{missing 'typename' prior to dependent type name}}
+
+   A<U>::TYPE a5; // expected-error {{missing 'typename' prior to dependent type name}}
+   Base3::TYPE a6; // expected-error {{missing 'typename' prior to dependent type name}}
+ };
+
+class D {
+public:
+    typedef int Type;
+};
+
+template <class T>
+void function_missing_typename(const T::Type param)// expected-warning {{missing 'typename' prior to dependent type name}}
+{
+    const T::Type var = 2; // expected-warning {{missing 'typename' prior to dependent type name}}
+}
+
+template void function_missing_typename<D>(const D::Type param);
+
+}
+
 enum ENUM2 {
 	ENUM2_a = (enum ENUM2) 4,
 	ENUM2_b = 0x9FFFFFFF, // expected-warning {{enumerator value is not representable in the underlying type 'int'}}
 	ENUM2_c = 0x100000000 // expected-warning {{enumerator value is not representable in the underlying type 'int'}}
 };
-

-

+
+