diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.cons/wchar_pointer.pass.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.cons/wchar_pointer.pass.cpp --- a/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.cons/wchar_pointer.pass.cpp +++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.cons/wchar_pointer.pass.cpp @@ -20,7 +20,6 @@ int main(int, char**) { -#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR std::wstring temp = get_wide_temp_file_name(); { std::fstream fs(temp.c_str(), std::ios_base::in | std::ios_base::out @@ -42,7 +41,6 @@ assert(x == 3.25); } _wremove(temp.c_str()); -#endif - return 0; + return 0; } diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp --- a/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp +++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp @@ -20,7 +20,6 @@ int main(int, char**) { -#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR std::wstring temp = get_wide_temp_file_name(); { std::fstream fs; @@ -48,7 +47,6 @@ assert(x == 3.25); } _wremove(temp.c_str()); -#endif - return 0; + return 0; } diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.cons/wchar_pointer.pass.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.cons/wchar_pointer.pass.cpp --- a/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.cons/wchar_pointer.pass.cpp +++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.cons/wchar_pointer.pass.cpp @@ -22,7 +22,6 @@ int main(int, char**) { -#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR { std::ifstream fs(L"test.dat"); double x = 0; @@ -41,7 +40,6 @@ // std::wifstream(const wchar_t*, std::ios_base::openmode) is tested in // test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp // which creates writable files. -#endif - return 0; + return 0; } diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.members/open_wchar_pointer.pass.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.members/open_wchar_pointer.pass.cpp --- a/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.members/open_wchar_pointer.pass.cpp +++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.members/open_wchar_pointer.pass.cpp @@ -22,7 +22,6 @@ int main(int, char**) { -#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR { std::ifstream fs; assert(!fs.is_open()); @@ -47,7 +46,6 @@ fs >> c; assert(c == L'r'); } -#endif - return 0; + return 0; } diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp --- a/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp +++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp @@ -20,7 +20,6 @@ int main(int, char**) { -#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR std::wstring temp = get_wide_temp_file_name(); { std::ofstream fs(temp.c_str()); @@ -56,7 +55,6 @@ assert(x == 3.25); } _wremove(temp.c_str()); -#endif - return 0; + return 0; } diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.members/open_wchar_pointer.pass.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.members/open_wchar_pointer.pass.cpp --- a/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.members/open_wchar_pointer.pass.cpp +++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.members/open_wchar_pointer.pass.cpp @@ -20,7 +20,6 @@ int main(int, char**) { -#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR std::wstring temp = get_wide_temp_file_name(); { std::ofstream fs; @@ -56,7 +55,6 @@ assert(c == L'a'); } _wremove(temp.c_str()); -#endif - return 0; + return 0; } diff --git a/libcxx/test/support/platform_support.h b/libcxx/test/support/platform_support.h --- a/libcxx/test/support/platform_support.h +++ b/libcxx/test/support/platform_support.h @@ -101,14 +101,12 @@ #endif } -#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR inline std::wstring get_wide_temp_file_name() { return std::wstring_convert >().from_bytes( get_temp_file_name()); } -#endif // _LIBCPP_HAS_OPEN_WITH_WCHAR #endif // __CloudABI__