commit 673720d8cfbc8c9d08faec2817f1e1452e4ecc2e
author David Blaikie <dblaikie@gmail.com> Fri Apr 06 06:28:32 2012 +0000
committer David Blaikie <dblaikie@gmail.com> Fri Apr 06 06:28:32 2012 +0000
tree 99194974a6866a396b6421f03e2cb343ad8b6d7b
parent 9df1b963a69dc85a271b3791267e994485e0bfe1

Fix diagnostic text for r154163.

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

test/FixIt/fixit-cxx0x.cpp

diff --git a/test/FixIt/fixit-cxx0x.cpp b/test/FixIt/fixit-cxx0x.cpp
index 9e1f737..997d73a 100644
--- a/test/FixIt/fixit-cxx0x.cpp
+++ b/test/FixIt/fixit-cxx0x.cpp
@@ -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();

test/FixIt/fixit.cpp

diff --git a/test/FixIt/fixit.cpp b/test/FixIt/fixit.cpp
index e6701ad..7d531a5 100644
--- a/test/FixIt/fixit.cpp
+++ b/test/FixIt/fixit.cpp
@@ -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();

test/Parser/cxx-template-decl.cpp

diff --git a/test/Parser/cxx-template-decl.cpp b/test/Parser/cxx-template-decl.cpp
index 21ff21b..870be93 100644
--- a/test/Parser/cxx-template-decl.cpp
+++ b/test/Parser/cxx-template-decl.cpp
@@ -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();