[cfe-commits] r154164 - in /cfe/trunk/test: FixIt/fixit-cxx0x.cpp FixIt/fixit.cpp Parser/cxx-template-decl.cpp

[David Blaikie]

Author: dblaikie
Date: Fri Apr  6 01:28:32 2012
New Revision: 154164

URL: http://llvm.org/viewvc/llvm-project?rev=154164&view=rev
Log:
Fix diagnostic text for r154163.

Modified:
    cfe/trunk/test/FixIt/fixit-cxx0x.cpp
    cfe/trunk/test/FixIt/fixit.cpp
    cfe/trunk/test/Parser/cxx-template-decl.cpp

Modified: cfe/trunk/test/FixIt/fixit-cxx0x.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-cxx0x.cpp?rev=154164&r1=154163&r2=154164&view=diff
==============================================================================
--- cfe/trunk/test/FixIt/fixit-cxx0x.cpp (original)
+++ cfe/trunk/test/FixIt/fixit-cxx0x.cpp Fri Apr  6 01:28:32 2012
@@ -101,6 +101,6 @@
   int g = me.g(ifn, kfn);
 }
 
-template<template<typename> ...Foo, // expected-error {{template template parameters require 'class' after the parameter list}}
-         template<template<template<typename>>>> // expected-error 3 {{template template parameters require 'class' after the parameter list}}
+template<template<typename> ...Foo, // expected-error {{template template parameter requires 'class' after the parameter list}}
+         template<template<template<typename>>>> // expected-error 3 {{template template parameter requires 'class' after the parameter list}}
 void func();

Modified: cfe/trunk/test/FixIt/fixit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.cpp?rev=154164&r1=154163&r2=154164&view=diff
==============================================================================
--- cfe/trunk/test/FixIt/fixit.cpp (original)
+++ cfe/trunk/test/FixIt/fixit.cpp Fri Apr  6 01:28:32 2012
@@ -200,7 +200,7 @@
   return Mystery<T>::get();
 }
 
-template<template<typename> Foo, // expected-error {{template template parameters require 'class' after the parameter list}}
-         template<typename> typename Bar, // expected-error {{template template parameters require 'class' after the parameter list}}
-         template<typename> struct Baz> // expected-error {{template template parameters require 'class' after the parameter list}}
+template<template<typename> Foo, // expected-error {{template template parameter requires 'class' after the parameter list}}
+         template<typename> typename Bar, // expected-error {{template template parameter requires 'class' after the parameter list}}
+         template<typename> struct Baz> // expected-error {{template template parameter requires 'class' after the parameter list}}
 void func();

Modified: cfe/trunk/test/Parser/cxx-template-decl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx-template-decl.cpp?rev=154164&r1=154163&r2=154164&view=diff
==============================================================================
--- cfe/trunk/test/Parser/cxx-template-decl.cpp (original)
+++ cfe/trunk/test/Parser/cxx-template-decl.cpp Fri Apr  6 01:28:32 2012
@@ -11,8 +11,8 @@
 // expected-warning {{declaration does not declare anything}}
 template <template X> struct Err1; // expected-error {{expected '<' after 'template'}} \
 // expected-error{{extraneous}}
-template <template <typename> > struct Err2;       // expected-error {{template template parameters require 'class' after the parameter list}}
-template <template <typename> Foo> struct Err3;    // expected-error {{template template parameters require 'class' after the parameter list}}
+template <template <typename> > struct Err2;       // expected-error {{template template parameter requires 'class' after the parameter list}}
+template <template <typename> Foo> struct Err3;    // expected-error {{template template parameter requires 'class' after the parameter list}}
 
 // Template function declarations
 template <typename T> void foo();