[libcxx-commits] [libcxx] r364554 - 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.

[Marshall Clow via libcxx-commits]

Author: marshall
Date: Thu Jun 27 08:37:31 2019
New Revision: 364554

URL: http://llvm.org/viewvc/llvm-project?rev=364554&view=rev
Log:
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.

Modified:
    libcxx/trunk/test/std/strings/basic.string.hash/char_type_hash.fail.cpp
    libcxx/trunk/test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp

Modified: libcxx/trunk/test/std/strings/basic.string.hash/char_type_hash.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string.hash/char_type_hash.fail.cpp?rev=364554&r1=364553&r2=364554&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/basic.string.hash/char_type_hash.fail.cpp (original)
+++ libcxx/trunk/test/std/strings/basic.string.hash/char_type_hash.fail.cpp Thu Jun 27 08:37:31 2019
@@ -53,7 +53,7 @@ template <class CharT>
 void test() {
     typedef std::basic_string<CharT, trait<CharT> > 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**) {

Modified: libcxx/trunk/test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp?rev=364554&r1=364553&r2=364554&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp (original)
+++ libcxx/trunk/test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp Thu Jun 27 08:37:31 2019
@@ -54,7 +54,7 @@ template <class CharT>
 void test() {
     typedef std::basic_string_view<CharT, trait<CharT> > 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**) {