dr176.C: Add missing semicolon (typo).

	* g++.dg/tc1/dr176.C: Add missing semicolon (typo).
	* g++.dg/tc1/dr101.C, g++.dg/tc1/dr135.C, g++.dg/tc1/dr142.C,
	g++.dg/tc1/dr152.C, g++.dg/tc1/dr159.C,	g++.dg/tc1/dr161.C,
	g++.dg/tc1/dr166.C, g++.dg/tc1/dr176.C,	g++.dg/tc1/dr193.C,
	g++.dg/tc1/dr194.C, g++.dg/tc1/dr217.C,	g++.dg/tc1/dr56.C,
	g++.dg/tc1/dr68.C, g++.dg/tc1/dr76.C, g++.dg/tc1/dr80.C,
	g++.dg/tc1/dr94.C: Fix line terminator.

From-SVN: r77950

18 files changed, 437 insertions, 427 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 90b5678..2f5a956 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-17  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
+
+	* g++.dg/tc1/dr176.C: Add missing semicolon (typo).
+	* g++.dg/tc1/dr101.C, g++.dg/tc1/dr135.C, g++.dg/tc1/dr142.C,
+	g++.dg/tc1/dr152.C, g++.dg/tc1/dr159.C,	g++.dg/tc1/dr161.C,
+	g++.dg/tc1/dr166.C, g++.dg/tc1/dr176.C,	g++.dg/tc1/dr193.C,
+	g++.dg/tc1/dr194.C, g++.dg/tc1/dr217.C,	g++.dg/tc1/dr56.C,
+	g++.dg/tc1/dr68.C, g++.dg/tc1/dr76.C, g++.dg/tc1/dr80.C,
+	g++.dg/tc1/dr94.C: Fix line terminator.
+
 2004-02-16  Geoffrey Keating  <geoffk@apple.com>
 
 	* gcc.c-torture/compile/20040216-1.c: New.
diff --git a/gcc/testsuite/g++.dg/tc1/dr101.C b/gcc/testsuite/g++.dg/tc1/dr101.C
index 79cb1b0..ede2215 100644
--- a/gcc/testsuite/g++.dg/tc1/dr101.C
+++ b/gcc/testsuite/g++.dg/tc1/dr101.C
@@ -1,31 +1,31 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR101: Redeclaration of extern "C" names via using-declarations 

-

-namespace Test1 {

-

-  typedef unsigned int X;

-  extern "C" void f1();

-  namespace N {

-    typedef unsigned int X;

-    extern "C" void f1();

-  }

-  using N::f1; // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" }

-  using N::X;  // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" }

-}

-

-

-namespace Test2 {

-

-  typedef unsigned int X;

-  extern "C" int f2();

-  namespace N {

-    typedef unsigned int X;

-    extern "C" int f2();

-  }

-  using namespace N;

-  int i = f2(); // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" }

-  X x;          // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" { xfail *-*-* } }

-

-}

-

+// DR101: Redeclaration of extern "C" names via using-declarations 
+
+namespace Test1 {
+
+  typedef unsigned int X;
+  extern "C" void f1();
+  namespace N {
+    typedef unsigned int X;
+    extern "C" void f1();
+  }
+  using N::f1; // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" }
+  using N::X;  // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" }
+}
+
+
+namespace Test2 {
+
+  typedef unsigned int X;
+  extern "C" int f2();
+  namespace N {
+    typedef unsigned int X;
+    extern "C" int f2();
+  }
+  using namespace N;
+  int i = f2(); // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" }
+  X x;          // { dg-bogus "" "redeclaration through 'using' should not be ambiguous" { xfail *-*-* } }
+
+}
+
diff --git a/gcc/testsuite/g++.dg/tc1/dr135.C b/gcc/testsuite/g++.dg/tc1/dr135.C
index 91a7727..beed8cd 100644
--- a/gcc/testsuite/g++.dg/tc1/dr135.C
+++ b/gcc/testsuite/g++.dg/tc1/dr135.C
@@ -1,8 +1,8 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR135: Class type in in-class member function definitions 

-

-struct S {

-  S f() { return S(); }  // { dg-bogus "" "incomplete class type is allowed as return type" }

-  void g(S) { }          // { dg-bogus "" "incomplete class type is allowed as parameter type" }

-};

+// DR135: Class type in in-class member function definitions 
+
+struct S {
+  S f() { return S(); }  // { dg-bogus "" "incomplete class type is allowed as return type" }
+  void g(S) { }          // { dg-bogus "" "incomplete class type is allowed as parameter type" }
+};
diff --git a/gcc/testsuite/g++.dg/tc1/dr142.C b/gcc/testsuite/g++.dg/tc1/dr142.C
index 6043c3d..c49f4dd 100644
--- a/gcc/testsuite/g++.dg/tc1/dr142.C
+++ b/gcc/testsuite/g++.dg/tc1/dr142.C
@@ -1,32 +1,32 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR142: Injection-related errors in access example 

-

-class B {                 // { dg-error "inaccessible" }

-public:

-  int mi;                 // { dg-error "inaccessible" }

-  static int si;          // { dg-error "inaccessible" }

-};

-

-class D: private B {

-};

-

-class DD: public D {

-  void f();

-};

-

-void DD::f() {

-  mi = 3;          // { dg-error "within this context" "" }

-  si = 3;          // { dg-error "within this context" "" }

-  ::B b;

-  b.mi = 3;

-  b.si = 3;

-  ::B::si = 3;

-  ::B* bp1 = this;        // { dg-error "inaccessible base" "" }

-  ::B* bp2 = (::B*)this;

-  bp2->mi = 3;

-

-

-  B b2;                   // { dg-error "within this context" "" }

-  B::si = 3;              // { dg-error "within this context" "" }

-}

+// DR142: Injection-related errors in access example 
+
+class B {                 // { dg-error "inaccessible" }
+public:
+  int mi;                 // { dg-error "inaccessible" }
+  static int si;          // { dg-error "inaccessible" }
+};
+
+class D: private B {
+};
+
+class DD: public D {
+  void f();
+};
+
+void DD::f() {
+  mi = 3;          // { dg-error "within this context" "" }
+  si = 3;          // { dg-error "within this context" "" }
+  ::B b;
+  b.mi = 3;
+  b.si = 3;
+  ::B::si = 3;
+  ::B* bp1 = this;        // { dg-error "inaccessible base" "" }
+  ::B* bp2 = (::B*)this;
+  bp2->mi = 3;
+
+
+  B b2;                   // { dg-error "within this context" "" }
+  B::si = 3;              // { dg-error "within this context" "" }
+}
diff --git a/gcc/testsuite/g++.dg/tc1/dr152.C b/gcc/testsuite/g++.dg/tc1/dr152.C
index 23c73b5..1b6dd87 100644
--- a/gcc/testsuite/g++.dg/tc1/dr152.C
+++ b/gcc/testsuite/g++.dg/tc1/dr152.C
@@ -1,36 +1,36 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR152: explicit copy constructors 

+// DR152: explicit copy constructors 
 
-namespace N1 {

-  struct X {

-    X();

-    explicit X(const X&);

-  };

-  void f(X);

-  int foo() 

-  { 

-    X x; 

-    f(x);     // { dg-error "" "" }

-  }

+namespace N1 {
+  struct X {
+    X();
+    explicit X(const X&);
+  };
+  void f(X);
+  int foo() 
+  { 
+    X x; 
+    f(x);     // { dg-error "" "" }
+  }
 }
 
-namespace N2 {

-  template <class T>

-  struct X {

-    X();

-    explicit X(const X&);

-  };

-

-  template <class T>

-  void f(T ) {}

-  

-  template <class T>

-  int foo() 

-  { 

-    X<T> x; 

-    N2::f(x);   // { dg-error "" "" }

-  }

-

-  template int foo<float>();  // { dg-error "instantiated from here" }

+namespace N2 {
+  template <class T>
+  struct X {
+    X();
+    explicit X(const X&);
+  };
+
+  template <class T>
+  void f(T ) {}
+  
+  template <class T>
+  int foo() 
+  { 
+    X<T> x; 
+    N2::f(x);   // { dg-error "" "" }
+  }
+
+  template int foo<float>();  // { dg-error "instantiated from here" }
 }
diff --git a/gcc/testsuite/g++.dg/tc1/dr159.C b/gcc/testsuite/g++.dg/tc1/dr159.C
index 6d04921..74d23f1 100644
--- a/gcc/testsuite/g++.dg/tc1/dr159.C
+++ b/gcc/testsuite/g++.dg/tc1/dr159.C
@@ -1,12 +1,12 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR159: Namespace qualification in declarators 

-

-namespace N {

-  namespace M {

-    void f();

-    void g();

-  }

-  void M::f(){}

-  void N::M::g(){}

-}

+// DR159: Namespace qualification in declarators 
+
+namespace N {
+  namespace M {
+    void f();
+    void g();
+  }
+  void M::f(){}
+  void N::M::g(){}
+}
diff --git a/gcc/testsuite/g++.dg/tc1/dr161.C b/gcc/testsuite/g++.dg/tc1/dr161.C
index f089353..49f679a 100644
--- a/gcc/testsuite/g++.dg/tc1/dr161.C
+++ b/gcc/testsuite/g++.dg/tc1/dr161.C
@@ -1,50 +1,50 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR161: Access to protected nested type 

-

-namespace N1 {

-  struct A 

-  {

-  protected:

-    typedef int type;

-  };

-

-  struct B : public A

-  {

-    void test(void)

-    {

-      A::type t;

-    }

-

-    friend void ftest(void)

-    {

-      A::type t;

-    }

-  };

-}

-

-

-namespace N2 {

-  template <class T>

-  struct A 

-  {

-  protected:

-    typedef int type;

-  };

-

-  template <class T>

-  struct B : public A<T>

-  {

-    void test(B b)

-    {

-      typename A<T>::type t;

-    }

-

-    friend void ftest(B b)

-    {

-      typename A<T>::type t;

-    }

-  };

-

-  template struct B<void>;

-}

+// DR161: Access to protected nested type 
+
+namespace N1 {
+  struct A 
+  {
+  protected:
+    typedef int type;
+  };
+
+  struct B : public A
+  {
+    void test(void)
+    {
+      A::type t;
+    }
+
+    friend void ftest(void)
+    {
+      A::type t;
+    }
+  };
+}
+
+
+namespace N2 {
+  template <class T>
+  struct A 
+  {
+  protected:
+    typedef int type;
+  };
+
+  template <class T>
+  struct B : public A<T>
+  {
+    void test(B b)
+    {
+      typename A<T>::type t;
+    }
+
+    friend void ftest(B b)
+    {
+      typename A<T>::type t;
+    }
+  };
+
+  template struct B<void>;
+}
diff --git a/gcc/testsuite/g++.dg/tc1/dr166.C b/gcc/testsuite/g++.dg/tc1/dr166.C
index 6f2a26d..cc4631a 100644
--- a/gcc/testsuite/g++.dg/tc1/dr166.C
+++ b/gcc/testsuite/g++.dg/tc1/dr166.C
@@ -1,60 +1,60 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR166: Friend declarations of template-ids 

-

-namespace N {

-  template <class T> void f(T);

-  void g();

-

-  namespace M {

-    class A {

-      friend void f<int>(int); // N::f

-      static int x;   // { dg-error "private" }

-    };

-    

-    class B {

-      template <class T> friend void f(T);  // M::f

-      static int x;   // { dg-error "private" }

-    };

-

-    class C {

-      friend void g(); // M::g

-      static int x;   // { dg-error "private" }

-    };

-

-    template <class T> void f(T)  // will be instantiated as f<long>

-    {

-      M::A::x = 0;    // { dg-error "within this context" }

-      M::B::x = 0;

-    }

-    template <> void f<int>(int)

-    { M::A::x = 0; }      // { dg-error "within this context" }

-    template <> void f<double>(double )

-    { 

-      M::B::x = 0; 

-      M::f<long>(0);   // { dg-error "instantiated" }

-    }

-

-    void g(void)

-    { M::C::x = 0; }

-  }

-

-  template <class T> void f(T)  // will be instantiated as f<long>

-  { 

-    M::A::x = 0;       // { dg-error "within this context" }

-    M::B::x = 0;       // { dg-error "within this context" }

-  }

-

-  template <> void f<int>(int )

-  { 

-    N::f<long>(0);        // { dg-error "instantiated" }

-    M::A::x = 0; 

-    M::B::x = 0;       // { dg-error "within this context" }

-  }

-

-  template <> void f<char>(char )

-  { M::A::x = 0; }      // { dg-error "within this context" }

-

-  void g(void)

-  { M::C::x = 0; }      // { dg-error "within this context" }

-}

+// DR166: Friend declarations of template-ids 
+
+namespace N {
+  template <class T> void f(T);
+  void g();
+
+  namespace M {
+    class A {
+      friend void f<int>(int); // N::f
+      static int x;   // { dg-error "private" }
+    };
+    
+    class B {
+      template <class T> friend void f(T);  // M::f
+      static int x;   // { dg-error "private" }
+    };
+
+    class C {
+      friend void g(); // M::g
+      static int x;   // { dg-error "private" }
+    };
+
+    template <class T> void f(T)  // will be instantiated as f<long>
+    {
+      M::A::x = 0;    // { dg-error "within this context" }
+      M::B::x = 0;
+    }
+    template <> void f<int>(int)
+    { M::A::x = 0; }      // { dg-error "within this context" }
+    template <> void f<double>(double )
+    { 
+      M::B::x = 0; 
+      M::f<long>(0);   // { dg-error "instantiated" }
+    }
+
+    void g(void)
+    { M::C::x = 0; }
+  }
+
+  template <class T> void f(T)  // will be instantiated as f<long>
+  { 
+    M::A::x = 0;       // { dg-error "within this context" }
+    M::B::x = 0;       // { dg-error "within this context" }
+  }
+
+  template <> void f<int>(int )
+  { 
+    N::f<long>(0);        // { dg-error "instantiated" }
+    M::A::x = 0; 
+    M::B::x = 0;       // { dg-error "within this context" }
+  }
+
+  template <> void f<char>(char )
+  { M::A::x = 0; }      // { dg-error "within this context" }
+
+  void g(void)
+  { M::C::x = 0; }      // { dg-error "within this context" }
+}
diff --git a/gcc/testsuite/g++.dg/tc1/dr176.C b/gcc/testsuite/g++.dg/tc1/dr176.C
index b308ad8..aad805b 100644
--- a/gcc/testsuite/g++.dg/tc1/dr176.C
+++ b/gcc/testsuite/g++.dg/tc1/dr176.C
@@ -1,29 +1,29 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR176: Name injection and templates 

-

-namespace N1 {

-  template <class T> struct Base {

-    Base* p;

-    Base<T*>* p2;

-    ::Base* p3;    // { dg-error "" "" }

-  };

-

-  template <class T> struct Derived: public Base<T> {

-    Base* p;     // { dg-bogus "" "injected class name in derived classes" { xfail *-*-* } }

-    Base<T*>* p2;

-    typename Derived::Base* p3;   // { dg-bogus "" "injected class name in derived classes" { xfail *-*-* } }

-  };

-

-  template struct Derived<void>;  // { dg-bogus "instantiated from here" "everything should be looked up at parsing time (after DR224)" { xfail *-*-* } }

-}

-

-

-namespace N2 {

-  template <class T> struct Base {};

-  template <class T> struct Derived: public Base<T> {

-    typename Derived::template Base<double>* p1;  // { dg-bogus "" "" { xfail *-*-* } }

-  }

-

-  template struct Derived<void>;

-}

+// DR176: Name injection and templates 
+
+namespace N1 {
+  template <class T> struct Base {
+    Base* p;
+    Base<T*>* p2;
+    ::Base* p3;    // { dg-error "" "" }
+  };
+
+  template <class T> struct Derived: public Base<T> {
+    Base* p;     // { dg-bogus "" "injected class name in derived classes" { xfail *-*-* } }
+    Base<T*>* p2;
+    typename Derived::Base* p3;   // { dg-bogus "" "injected class name in derived classes" { xfail *-*-* } }
+  };
+
+  template struct Derived<void>;  // { dg-bogus "instantiated from here" "everything should be looked up at parsing time (after DR224)" { xfail *-*-* } }
+}
+
+
+namespace N2 {
+  template <class T> struct Base {};
+  template <class T> struct Derived: public Base<T> {
+    typename Derived::template Base<double>* p1;  // { dg-bogus "" "" { xfail *-*-* } }
+  };
+
+  template struct Derived<void>;
+}
diff --git a/gcc/testsuite/g++.dg/tc1/dr193.C b/gcc/testsuite/g++.dg/tc1/dr193.C
index 1319b88..5855593 100644
--- a/gcc/testsuite/g++.dg/tc1/dr193.C
+++ b/gcc/testsuite/g++.dg/tc1/dr193.C
@@ -1,72 +1,72 @@
 // { dg-do run }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR193: Order of destruction of local automatics of destructor 

-

-extern "C" void abort(void);

-

-namespace N1 {

-  bool a_done = false;

-  struct A

-  { 

-    ~A()

-    {

-      a_done = true;

-    }

-  };

-

-  struct B

-  { 

-    ~B()

-    {

-      if (!a_done)

-        abort();

-    }

-  };

-

-  struct C {

-    B x;

-    ~C() {

-      A y;

-    };

-  };

-}

-

-

-namespace N2 {

-  bool a_done = false;

-

-  template <class>

-  struct A

-  { 

-    ~A()

-    {

-      a_done = true;

-    }

-  };

-

-  template <class>

-  struct B

-  { 

-    ~B()

-    {

-      if (!a_done)

-        abort();

-    }

-  };

-

-  template <class T>

-  struct C {

-    B<T> x;

-    ~C() {

-      A<T> y;

-    };

-  };

-}

-

-

-int main(void)

-{

-  N1::C c1;

-  N2::C<void> c2;

-  return 0;

-}

+// DR193: Order of destruction of local automatics of destructor 
+
+extern "C" void abort(void);
+
+namespace N1 {
+  bool a_done = false;
+  struct A
+  { 
+    ~A()
+    {
+      a_done = true;
+    }
+  };
+
+  struct B
+  { 
+    ~B()
+    {
+      if (!a_done)
+        abort();
+    }
+  };
+
+  struct C {
+    B x;
+    ~C() {
+      A y;
+    };
+  };
+}
+
+
+namespace N2 {
+  bool a_done = false;
+
+  template <class>
+  struct A
+  { 
+    ~A()
+    {
+      a_done = true;
+    }
+  };
+
+  template <class>
+  struct B
+  { 
+    ~B()
+    {
+      if (!a_done)
+        abort();
+    }
+  };
+
+  template <class T>
+  struct C {
+    B<T> x;
+    ~C() {
+      A<T> y;
+    };
+  };
+}
+
+
+int main(void)
+{
+  N1::C c1;
+  N2::C<void> c2;
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/tc1/dr194.C b/gcc/testsuite/g++.dg/tc1/dr194.C
index 3491468..3ed1300 100644
--- a/gcc/testsuite/g++.dg/tc1/dr194.C
+++ b/gcc/testsuite/g++.dg/tc1/dr194.C
@@ -3,14 +3,14 @@
 // DR194: Identifying constructors 
 
 struct A
-{

-  inline explicit A();

+{
+  inline explicit A();
 };
 
 template <class>
 struct B
-{

-  inline explicit B();

+{
+  inline explicit B();
 };
 
 template struct B<void>;
diff --git a/gcc/testsuite/g++.dg/tc1/dr217.C b/gcc/testsuite/g++.dg/tc1/dr217.C
index 1fb3ce2..cfa2803 100644
--- a/gcc/testsuite/g++.dg/tc1/dr217.C
+++ b/gcc/testsuite/g++.dg/tc1/dr217.C
@@ -1,14 +1,14 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR217: Default arguments for non-template member functions of class 

-//  templates 

-

-template <class T>

-struct S

-{

-  void foo (int);

-};

-

-template <class T>

-void S<T>::foo (int = 0)  // { dg-error "" "default arguments for parameters of member functions of class templates can be specified in the initial declaration only" { xfail *-*-* } }

-{ }

+// DR217: Default arguments for non-template member functions of class 
+//  templates 
+
+template <class T>
+struct S
+{
+  void foo (int);
+};
+
+template <class T>
+void S<T>::foo (int = 0)  // { dg-error "" "default arguments for parameters of member functions of class templates can be specified in the initial declaration only" { xfail *-*-* } }
+{ }
diff --git a/gcc/testsuite/g++.dg/tc1/dr48.C b/gcc/testsuite/g++.dg/tc1/dr48.C
index 16732d2..19c1738 100644
--- a/gcc/testsuite/g++.dg/tc1/dr48.C
+++ b/gcc/testsuite/g++.dg/tc1/dr48.C
@@ -1,13 +1,13 @@
 // { dg-do link }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR48: Definitions of unused static members 

-

-struct A {

-  static const int size = 10;

-  int array[size];

-};

-

-int main() {

-  A a;

-  return 0;

-}

+// DR48: Definitions of unused static members 
+
+struct A {
+  static const int size = 10;
+  int array[size];
+};
+
+int main() {
+  A a;
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/tc1/dr56.C b/gcc/testsuite/g++.dg/tc1/dr56.C
index 1451ce8..a5caea8 100644
--- a/gcc/testsuite/g++.dg/tc1/dr56.C
+++ b/gcc/testsuite/g++.dg/tc1/dr56.C
@@ -1,12 +1,12 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR56: Redeclaring typedefs within classes 

-

-class X { 

-  typedef int I; 

-  typedef int I;  // { dg-error "" "Cannot redeclare a typedef in a class scope" { xfail *-*-* } }

-};

-

-// In non-class scope, they are allowed.

-typedef int A;

-typedef int A;

+// DR56: Redeclaring typedefs within classes 
+
+class X { 
+  typedef int I; 
+  typedef int I;  // { dg-error "" "Cannot redeclare a typedef in a class scope" { xfail *-*-* } }
+};
+
+// In non-class scope, they are allowed.
+typedef int A;
+typedef int A;
diff --git a/gcc/testsuite/g++.dg/tc1/dr68.C b/gcc/testsuite/g++.dg/tc1/dr68.C
index 60b2c6b..253f049 100644
--- a/gcc/testsuite/g++.dg/tc1/dr68.C
+++ b/gcc/testsuite/g++.dg/tc1/dr68.C
@@ -1,20 +1,20 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR68: Grammar does not allow "friend class A<int>;" 

-

-namespace A{

-  class B{};

-}

-

-namespace B{

-  class A{};

-  class C{

-    friend class ::A::B;

-  };

-}

-

-

-template <typename> class K;

-class J {

-  friend class K<int>;

-};

+// DR68: Grammar does not allow "friend class A<int>;" 
+
+namespace A{
+  class B{};
+}
+
+namespace B{
+  class A{};
+  class C{
+    friend class ::A::B;
+  };
+}
+
+
+template <typename> class K;
+class J {
+  friend class K<int>;
+};
diff --git a/gcc/testsuite/g++.dg/tc1/dr76.C b/gcc/testsuite/g++.dg/tc1/dr76.C
index dfe7ecf..6d3d1c1 100644
--- a/gcc/testsuite/g++.dg/tc1/dr76.C
+++ b/gcc/testsuite/g++.dg/tc1/dr76.C
@@ -1,8 +1,8 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR76: Are const volatile variables considered "constant expressions"? 

-

-volatile const int a = 5;

-

-template <int> struct K;

-template struct K<a>;	// { dg-error "non-constant" }

+// DR76: Are const volatile variables considered "constant expressions"? 
+
+volatile const int a = 5;
+
+template <int> struct K;
+template struct K<a>;	// { dg-error "non-constant" }
diff --git a/gcc/testsuite/g++.dg/tc1/dr80.C b/gcc/testsuite/g++.dg/tc1/dr80.C
index e7d3731..2327428 100644
--- a/gcc/testsuite/g++.dg/tc1/dr80.C
+++ b/gcc/testsuite/g++.dg/tc1/dr80.C
@@ -1,53 +1,53 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR80: Class members with same name as class 

-

-struct A 

-{

-  int A;

-};

-

-struct A2

-{

-  static int A2;  // { dg-error "same name as" }

-};

-

-

-template <class>

-struct A3

-{

-  int A3;

-};

-

-template <class>

-struct A4

-{

-  static int A4;  // { dg-error "same name as" }

-};

-

-

-struct B

-{

-  B();

-  int B;  // { dg-error "same name as" }

-};

-

-struct B2

-{

-  B2();

-  static int B2;  // { dg-error "same name as" }

-};

-

-template <class>

-struct B3

-{

-  B3();

-  int B3;  // { dg-error "same name as" "this error should appear at parsing time" { xfail *-*-* } }

-};

-

-template <class>

-struct B4

-{

-  B4();

-  static int B4;  // { dg-error "same name as" }

-};

+// DR80: Class members with same name as class 
+
+struct A 
+{
+  int A;
+};
+
+struct A2
+{
+  static int A2;  // { dg-error "same name as" }
+};
+
+
+template <class>
+struct A3
+{
+  int A3;
+};
+
+template <class>
+struct A4
+{
+  static int A4;  // { dg-error "same name as" }
+};
+
+
+struct B
+{
+  B();
+  int B;  // { dg-error "same name as" }
+};
+
+struct B2
+{
+  B2();
+  static int B2;  // { dg-error "same name as" }
+};
+
+template <class>
+struct B3
+{
+  B3();
+  int B3;  // { dg-error "same name as" "this error should appear at parsing time" { xfail *-*-* } }
+};
+
+template <class>
+struct B4
+{
+  B4();
+  static int B4;  // { dg-error "same name as" }
+};
diff --git a/gcc/testsuite/g++.dg/tc1/dr94.C b/gcc/testsuite/g++.dg/tc1/dr94.C
index 3909c65..97cf0c2 100644
--- a/gcc/testsuite/g++.dg/tc1/dr94.C
+++ b/gcc/testsuite/g++.dg/tc1/dr94.C
@@ -1,9 +1,9 @@
 // { dg-do compile }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-// DR94: Inconsistencies in the descriptions of constant expressions 

-

-struct S {

-  static const int c = 5;

-};

-int a[S::c];

-

+// DR94: Inconsistencies in the descriptions of constant expressions 
+
+struct S {
+  static const int c = 5;
+};
+int a[S::c];
+