From: David Blaikie <dblaikie@gmail.com>
Date: Fri, 6 Apr 2012 06:28:32 +0000 (+0000)
Subject: Fix diagnostic text for r154163.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=673720d8cfbc8c9d08faec2817f1e1452e4ecc2e;p=clang

Fix diagnostic text for r154163.

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

diff --git a/test/FixIt/fixit-cxx0x.cpp b/test/FixIt/fixit-cxx0x.cpp
index 9e1f737742..997d73abfb 100644
--- a/test/FixIt/fixit-cxx0x.cpp
+++ b/test/FixIt/fixit-cxx0x.cpp
@@ -101,6 +101,6 @@ namespace TestMisplacedEllipsisRecovery {
   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();
diff --git a/test/FixIt/fixit.cpp b/test/FixIt/fixit.cpp
index e6701ada04..7d531a537a 100644
--- a/test/FixIt/fixit.cpp
+++ b/test/FixIt/fixit.cpp
@@ -200,7 +200,7 @@ template<class T> typedef Mystery<T>::type getMysteriousThing() { // \
   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();
diff --git a/test/Parser/cxx-template-decl.cpp b/test/Parser/cxx-template-decl.cpp
index 21ff21b016..870be930a6 100644
--- a/test/Parser/cxx-template-decl.cpp
+++ b/test/Parser/cxx-template-decl.cpp
@@ -11,8 +11,8 @@ template < ;            // expected-error {{parse error}} \
 // 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();