test commit

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

diff --git a/test/Parser/cxx-using-declaration.cpp b/test/Parser/cxx-using-declaration.cpp
index 56bfb2f32747be508e3d599c551a0853f97e7659..212a7d89f87793da17bbb74201c716fda431fc0d 100644 (file)
--- a/test/Parser/cxx-using-declaration.cpp
+++ b/test/Parser/cxx-using-declaration.cpp
@@ -1,48 +1,47 @@
-// FIXME: Disabled, appears to have undefined behavior, and needs to be updated to match new warnings.\r
-// RUN: true\r
-\r
-// RUNX: clang-cc -fsyntax-only -verify %s\r
-\r
-namespace A {\r
-    int VA;\r
-    void FA() {}\r
-    struct SA { int V; };\r
-}\r
-\r
-using A::VA;\r
-using A::FA;\r
-using typename A::SA;\r
-\r
-void main()\r
-{\r
-    VA = 1;\r
-    FA();\r
-    SA x;   //Still needs handling.\r
-}\r
-\r
-struct B {\r
-    void f(char){};\r
-    void g(char){};\r
-};\r
-struct D : B {\r
-    using B::f;\r
-    void f(int);\r
-    void g(int);\r
-};\r
-void D::f(int) { f('c'); } // calls B::f(char)\r
-void D::g(int) { g('c'); } // recursively calls D::g(int)\r
-\r
-namespace E {\r
-    template <typename TYPE> int funcE(TYPE arg) { return(arg); }\r
-}\r
-\r
-using E::funcE<int>; // expected-error{{use of template specialization in using directive not allowed}}\r
-\r
-namespace F {\r
-    struct X;\r
-}\r
-\r
-using F::X;\r
-// Should have some errors here.  Waiting for implementation.\r
-void X(int);\r
-struct X *x;\r
+// FIXME: Disabled, appears to have undefined behavior, and needs to be updated to match new warnings.
+// RUN: true
+// RUNX: clang-cc -fsyntax-only -verify %s
+
+namespace A {
+    int VA;
+    void FA() {}
+    struct SA { int V; };
+}
+
+using A::VA;
+using A::FA;
+using typename A::SA;
+
+void main()
+{
+    VA = 1;
+    FA();
+    SA x;   //Still needs handling.
+}
+
+struct B {
+    void f(char){};
+    void g(char){};
+};
+struct D : B {
+    using B::f;
+    void f(int);
+    void g(int);
+};
+void D::f(int) { f('c'); } // calls B::f(char)
+void D::g(int) { g('c'); } // recursively calls D::g(int)
+
+namespace E {
+    template <typename TYPE> int funcE(TYPE arg) { return(arg); }
+}
+
+using E::funcE<int>; // expected-error{{use of template specialization in using directive not allowed}}
+
+namespace F {
+    struct X;
+}
+
+using F::X;
+// Should have some errors here.  Waiting for implementation.
+void X(int);
+struct X *x;