Browse Source

Followup to revision 364545: Turns out that clang issues different errors for C++11 vs c++2a, so I tweaked the 'expected-error' bits that I added to match either of them.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@364554 91177308-0d34-0410-b5e6-96231b3b80d8
Marshall Clow 6 years ago
parent
commit
2c2308c5e3

+ 1 - 1
test/std/strings/basic.string.hash/char_type_hash.fail.cpp

@@ -53,7 +53,7 @@ template <class CharT>
 void test() {
 void test() {
     typedef std::basic_string<CharT, trait<CharT> > str_t;
     typedef std::basic_string<CharT, trait<CharT> > str_t;
     std::hash<str_t>
     std::hash<str_t>
-        h; // expected-error-re 4 {{call to implicitly-deleted default constructor of 'std::hash<str_t>' {{.+}}}}}
+        h; // expected-error-re 4 {{{{call to implicitly-deleted default constructor of 'std::hash<str_t>'|implicit instantiation of undefined template}} {{.+}}}}}}
 }
 }
 
 
 int main(int, char**) {
 int main(int, char**) {

+ 1 - 1
test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp

@@ -54,7 +54,7 @@ template <class CharT>
 void test() {
 void test() {
     typedef std::basic_string_view<CharT, trait<CharT> > strv_t;
     typedef std::basic_string_view<CharT, trait<CharT> > strv_t;
     std::hash<strv_t>
     std::hash<strv_t>
-        h; // expected-error-re 4 {{call to implicitly-deleted default constructor of 'std::hash<strv_t>' {{.+}}}}}}
+        h; // expected-error-re 4 {{{{call to implicitly-deleted default constructor of 'std::hash<strv_t>'|implicit instantiation of undefined template}} {{.+}}}}}}
 }
 }
 
 
 int main(int, char**) {
 int main(int, char**) {