summaryrefslogtreecommitdiff
path: root/test/SemaTemplate/temp_arg_nontype.cpp
diff options
context:
space:
mode:
authorAlp Toker <alp@nuanti.com>2013-12-14 01:07:05 +0000
committerAlp Toker <alp@nuanti.com>2013-12-14 01:07:05 +0000
commitda46e89f75f45c64b6b3851a935b97b7ea3e3f00 (patch)
tree0f7401b0f575670923e9303e93a584ed05ebfe48 /test/SemaTemplate/temp_arg_nontype.cpp
parent3f13c4ec6473740778342ac19ea36ac690377d45 (diff)
downloadclang-da46e89f75f45c64b6b3851a935b97b7ea3e3f00.tar.gz
clang-da46e89f75f45c64b6b3851a935b97b7ea3e3f00.tar.bz2
clang-da46e89f75f45c64b6b3851a935b97b7ea3e3f00.tar.xz
Revert "Don't require -re suffix on -verify directives with regexes."
This patch was submitted to the list for review and didn't receive a LGTM. (In fact one explicit objection and one query were raised.) This reverts commit r197295. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@197299 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/SemaTemplate/temp_arg_nontype.cpp')
-rw-r--r--test/SemaTemplate/temp_arg_nontype.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/SemaTemplate/temp_arg_nontype.cpp b/test/SemaTemplate/temp_arg_nontype.cpp
index 820ce2c344..91b0c6e765 100644
--- a/test/SemaTemplate/temp_arg_nontype.cpp
+++ b/test/SemaTemplate/temp_arg_nontype.cpp
@@ -82,7 +82,7 @@ struct Z {
template<int (Z::*pmf)(int)> struct A6; // expected-note{{template parameter is declared here}}
A6<&Z::foo> *a17_1;
A6<&Z::bar> *a17_2;
-A6<&Z::baz> *a17_3; // expected-error{{non-type template argument of type 'double (Z::*)(double){{( __attribute__\(\(thiscall\)\))?}}' cannot be converted to a value of type 'int (Z::*)(int){{( __attribute__\(\(thiscall\)\))?}}'}}
+A6<&Z::baz> *a17_3; // expected-error-re{{non-type template argument of type 'double (Z::*)(double){{( __attribute__\(\(thiscall\)\))?}}' cannot be converted to a value of type 'int (Z::*)(int){{( __attribute__\(\(thiscall\)\))?}}'}}
template<int Z::*pm> struct A7; // expected-note{{template parameter is declared here}}