@@ -135,7 +135,7 @@ class TestSimplifyTemplate : public TestFixture {
135135 }
136136
137137 void template1 () {
138- const char code[] = " template <classname T> void f(T val) { T a; }\n "
138+ const char code[] = " template <class T> void f(T val) { T a; }\n "
139139 " f<int>(10);" ;
140140
141141 const char expected[] = " f<int> ( 10 ) ; "
@@ -145,7 +145,7 @@ class TestSimplifyTemplate : public TestFixture {
145145 }
146146
147147 void template2 () {
148- const char code[] = " template <classname T> class Fred { T a; };\n "
148+ const char code[] = " template <class T> class Fred { T a; };\n "
149149 " Fred<int> fred;" ;
150150
151151 const char expected[] = " Fred<int> fred ; "
@@ -155,7 +155,7 @@ class TestSimplifyTemplate : public TestFixture {
155155 }
156156
157157 void template3 () {
158- const char code[] = " template <classname T, int sz> class Fred { T data[sz]; };\n "
158+ const char code[] = " template <class T, int sz> class Fred { T data[sz]; };\n "
159159 " Fred<float,4> fred;" ;
160160
161161 const char expected[] = " Fred<float,4> fred ; "
@@ -165,7 +165,7 @@ class TestSimplifyTemplate : public TestFixture {
165165 }
166166
167167 void template4 () {
168- const char code[] = " template <classname T> class Fred { Fred(); };\n "
168+ const char code[] = " template <class T> class Fred { Fred(); };\n "
169169 " Fred<float> fred;" ;
170170
171171 const char expected[] = " Fred<float> fred ; "
@@ -175,11 +175,11 @@ class TestSimplifyTemplate : public TestFixture {
175175 }
176176
177177 void template5 () {
178- const char code[] = " template <classname T> class Fred { };\n "
179- " template <classname T> Fred<T>::Fred() { }\n "
178+ const char code[] = " template <class T> class Fred { };\n "
179+ " template <class T> Fred<T>::Fred() { }\n "
180180 " Fred<float> fred;" ;
181181
182- const char expected[] = " template < classname T > Fred < T > :: Fred ( ) { } " // <- TODO: this should be removed
182+ const char expected[] = " template < class T > Fred < T > :: Fred ( ) { } " // <- TODO: this should be removed
183183 " Fred<float> fred ; "
184184 " class Fred<float> { } ; "
185185 " Fred<float> :: Fred<float> ( ) { }" ;
@@ -188,7 +188,7 @@ class TestSimplifyTemplate : public TestFixture {
188188 }
189189
190190 void template6 () {
191- const char code[] = " template <classname T> class Fred { };\n "
191+ const char code[] = " template <class T> class Fred { };\n "
192192 " Fred<float> fred1;\n "
193193 " Fred<float> fred2;" ;
194194
@@ -545,7 +545,7 @@ class TestSimplifyTemplate : public TestFixture {
545545
546546 void template21 () {
547547 {
548- const char code[] = " template <classname T> struct Fred { T a; };\n "
548+ const char code[] = " template <class T> struct Fred { T a; };\n "
549549 " Fred<int> fred;" ;
550550
551551 const char expected[] = " Fred<int> fred ; "
@@ -555,7 +555,7 @@ class TestSimplifyTemplate : public TestFixture {
555555 }
556556
557557 {
558- const char code[] = " template <classname T, int sz> struct Fred { T data[sz]; };\n "
558+ const char code[] = " template <class T, int sz> struct Fred { T data[sz]; };\n "
559559 " Fred<float,4> fred;" ;
560560
561561 const char expected[] = " Fred<float,4> fred ; "
@@ -565,7 +565,7 @@ class TestSimplifyTemplate : public TestFixture {
565565 }
566566
567567 {
568- const char code[] = " template <classname T> struct Fred { Fred(); };\n "
568+ const char code[] = " template <class T> struct Fred { Fred(); };\n "
569569 " Fred<float> fred;" ;
570570
571571 const char expected[] = " Fred<float> fred ; "
@@ -575,7 +575,7 @@ class TestSimplifyTemplate : public TestFixture {
575575 }
576576
577577 {
578- const char code[] = " template <classname T> struct Fred { };\n "
578+ const char code[] = " template <class T> struct Fred { };\n "
579579 " Fred<float> fred1;\n "
580580 " Fred<float> fred2;" ;
581581
@@ -588,7 +588,7 @@ class TestSimplifyTemplate : public TestFixture {
588588 }
589589
590590 void template22 () {
591- const char code[] = " template <classname T> struct Fred { T a; };\n "
591+ const char code[] = " template <class T> struct Fred { T a; };\n "
592592 " Fred<std::string> fred;" ;
593593
594594 const char expected[] = " Fred<std::string> fred ; "
@@ -598,7 +598,7 @@ class TestSimplifyTemplate : public TestFixture {
598598 }
599599
600600 void template23 () {
601- const char code[] = " template <classname T> void foo() { }\n "
601+ const char code[] = " template <class T> void foo() { }\n "
602602 " void bar() {\n "
603603 " std::cout << (foo<double>());\n "
604604 " }" ;
@@ -896,14 +896,14 @@ class TestSimplifyTemplate : public TestFixture {
896896 }
897897
898898 void template49 () { // #6237
899- const char code[] = " template <classname T> class Fred { void f(); void g(); };\n "
900- " template <classname T> void Fred<T>::f() { }\n "
901- " template <classname T> void Fred<T>::g() { }\n "
899+ const char code[] = " template <class T> class Fred { void f(); void g(); };\n "
900+ " template <class T> void Fred<T>::f() { }\n "
901+ " template <class T> void Fred<T>::g() { }\n "
902902 " template void Fred<float>::f();\n "
903903 " template void Fred<int>::g();\n " ;
904904
905- const char expected[] = " template < classname T > void Fred<T> :: f ( ) { } "
906- " template < classname T > void Fred<T> :: g ( ) { } "
905+ const char expected[] = " template < class T > void Fred<T> :: f ( ) { } "
906+ " template < class T > void Fred<T> :: g ( ) { } "
907907 " template void Fred<float> :: f ( ) ; "
908908 " template void Fred<int> :: g ( ) ; "
909909 " class Fred<T> { void f ( ) ; void g ( ) ; } ; "
@@ -916,12 +916,12 @@ class TestSimplifyTemplate : public TestFixture {
916916 }
917917
918918 void template50 () { // #4272
919- const char code[] = " template <classname T> class Fred { void f(); };\n "
920- " template <classname T> void Fred<T>::f() { }\n "
919+ const char code[] = " template <class T> class Fred { void f(); };\n "
920+ " template <class T> void Fred<T>::f() { }\n "
921921 " template<> void Fred<float>::f() { }\n "
922922 " template<> void Fred<int>::g() { }\n " ;
923923
924- const char expected[] = " template < classname T > void Fred<T> :: f ( ) { } "
924+ const char expected[] = " template < class T > void Fred<T> :: f ( ) { } "
925925 " template < > void Fred<float> :: f ( ) { } "
926926 " template < > void Fred<int> :: g ( ) { } "
927927 " class Fred<T> { void f ( ) ; } ; "
0 commit comments