summaryrefslogtreecommitdiffstats
path: root/test/FixIt
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2012-04-06 06:28:32 +0000
committerDavid Blaikie <dblaikie@gmail.com>2012-04-06 06:28:32 +0000
commit673720d8cfbc8c9d08faec2817f1e1452e4ecc2e (patch)
tree99194974a6866a396b6421f03e2cb343ad8b6d7b /test/FixIt
parent9df1b963a69dc85a271b3791267e994485e0bfe1 (diff)
Fix diagnostic text for r154163.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154164 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/FixIt')
-rw-r--r--test/FixIt/fixit-cxx0x.cpp4
-rw-r--r--test/FixIt/fixit.cpp6
2 files changed, 5 insertions, 5 deletions
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();