<p dir="ltr">Thanks!</p>
<div class="gmail_quote">On Oct 9, 2015 7:56 PM, "Eric Fiselier via cfe-commits" <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ericwf<br>
Date: Fri Oct 9 21:54:41 2015<br>
New Revision: 249936<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249936&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249936&view=rev</a><br>
Log:<br>
Get some of wchar_h.pass.cpp working on apple.<br>
<br>
Modified:<br>
libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp<br>
<br>
Modified: libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp?rev=249936&r1=249935&r2=249936&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp?rev=249936&r1=249935&r2=249936&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp (original)<br>
+++ libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp Fri Oct 9 21:54:41 2015<br>
@@ -9,11 +9,6 @@<br>
<br>
// <wchar.h><br>
<br>
-// This test fails on systems whose C library doesn't provide a correct overload<br>
-// set for wcschr, wcspbrk, wcsrchr, wcsstr, and wmemchr. There's no way for<br>
-// libc++ to fix that on the C library's behalf.<br>
-//<br>
-// XFAIL: apple-darwin<br>
<br>
#include <wchar.h><br>
#include <type_traits><br>
@@ -79,19 +74,19 @@ int main()<br>
static_assert((std::is_same<decltype(wcscoll(L"", L"")), int>::value), "");<br>
static_assert((std::is_same<decltype(wcsncmp(L"", L"", s)), int>::value), "");<br>
static_assert((std::is_same<decltype(wcsxfrm(ws, L"", s)), size_t>::value), "");<br>
- static_assert((std::is_same<decltype(wcschr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");<br>
+ // const wchar_t* wcschr((const wchar_t*)0, L' ') - See below<br>
static_assert((std::is_same<decltype(wcschr((wchar_t*)0, L' ')), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcscspn(L"", L"")), size_t>::value), "");<br>
static_assert((std::is_same<decltype(wcslen(L"")), size_t>::value), "");<br>
- static_assert((std::is_same<decltype(wcspbrk((const wchar_t*)0, L"")), const wchar_t*>::value), "");<br>
+ // const wchar_t* wcspbrk((const wchar_t*)0, L"") - See below<br>
static_assert((std::is_same<decltype(wcspbrk((wchar_t*)0, L"")), wchar_t*>::value), "");<br>
- static_assert((std::is_same<decltype(wcsrchr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");<br>
+ // const wchar_t* wcsrchr((const wchar_t*)0, L' ') - See below<br>
static_assert((std::is_same<decltype(wcsrchr((wchar_t*)0, L' ')), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcsspn(L"", L"")), size_t>::value), "");<br>
- static_assert((std::is_same<decltype(wcsstr((const wchar_t*)0, L"")), const wchar_t*>::value), "");<br>
+ // const wchar_t* wcsstr((const wchar_t*)0, L"") - See below<br>
static_assert((std::is_same<decltype(wcsstr((wchar_t*)0, L"")), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcstok(ws, L"", (wchar_t**)0)), wchar_t*>::value), "");<br>
- static_assert((std::is_same<decltype(wmemchr((const wchar_t*)0, L' ', s)), const wchar_t*>::value), "");<br>
+ // const wchar_t* wmemchr((const wchar_t*)0, L' ', s) - See below<br>
static_assert((std::is_same<decltype(wmemchr((wchar_t*)0, L' ', s)), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wmemcmp(L"", L"", s)), int>::value), "");<br>
static_assert((std::is_same<decltype(wmemcpy(ws, L"", s)), wchar_t*>::value), "");<br>
@@ -107,6 +102,17 @@ int main()<br>
static_assert((std::is_same<decltype(mbsrtowcs(ws, (const char**)0, s, &mb)), size_t>::value), "");<br>
static_assert((std::is_same<decltype(wcsrtombs(ns, (const wchar_t**)0, s, &mb)), size_t>::value), "");<br>
<br>
+// This test fails on systems whose C library doesn't provide a correct overload<br>
+// set for wcschr, wcspbrk, wcsrchr, wcsstr, and wmemchr. There's no way for<br>
+// libc++ to fix that on the C library's behalf.<br>
+#ifndef __APPLE__<br>
+ static_assert((std::is_same<decltype(wcschr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");<br>
+ static_assert((std::is_same<decltype(wcspbrk((const wchar_t*)0, L"")), const wchar_t*>::value), "");<br>
+ static_assert((std::is_same<decltype(wcsrchr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");<br>
+ static_assert((std::is_same<decltype(wcsstr((const wchar_t*)0, L"")), const wchar_t*>::value), "");<br>
+ static_assert((std::is_same<decltype(wmemchr((const wchar_t*)0, L' ', s)), const wchar_t*>::value), "");<br>
+#endif<br>
+<br>
#ifndef _LIBCPP_HAS_NO_STDIN<br>
static_assert((std::is_same<decltype(getwchar()), wint_t>::value), "");<br>
static_assert((std::is_same<decltype(vwscanf(L"", va)), int>::value), "");<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>