Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcxx/include/fstream
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ typedef basic_fstream<wchar_t> wfstream;
# include <__config>

// Downstream issue: #375 (Enable fstream independently of filesystem)
# if _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION || defined(_NEWLIB_VERSION)
# if _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION || defined(_LIBCPP_LIBC_NEWLIB)

# include <__algorithm/max.h>
# include <__assert>
Expand Down
2 changes: 1 addition & 1 deletion libcxx/src/ios.instantiations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ostringstream<char
template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_istringstream<char>;

// Downstream issue: #375 (Enable fstream independently of filesystem)
#if _LIBCPP_HAS_FILESYSTEM || defined(_NEWLIB_VERSION)
#if _LIBCPP_HAS_FILESYSTEM || defined(_LIBCPP_LIBC_NEWLIB)
template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ifstream<char>;
template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ofstream<char>;
template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_filebuf<char>;
Expand Down
2 changes: 1 addition & 1 deletion libcxx/src/ostream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <__config>

// Downstream issue: #375 (Enable fstream independently of filesystem)
#if _LIBCPP_HAS_FILESYSTEM || defined(_NEWLIB_VERSION)
#if _LIBCPP_HAS_FILESYSTEM || defined(_LIBCPP_LIBC_NEWLIB)
# include <fstream>
#endif
#include <ostream>
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/support/platform_support.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# include <fcntl.h> // _O_EXCL, ...
# include <sys/stat.h> // _S_IREAD, ...
// Downstream issue: #375 (Enable fstream independently of filesystem)
#elif defined(_NEWLIB_VERSION)
#elif defined(_LIBCPP_LIBC_NEWLIB)
// No need to include extra headers for the get_temp_file_name() implementation
// below: tmpnam() is defined in <stdio.h>
#elif __has_include(<unistd.h>)
Expand Down Expand Up @@ -75,7 +75,7 @@ inline std::string get_temp_file_name() {
abort();
}
// Downstream issue: #375 (Enable fstream independently of filesystem)
#elif defined(_NEWLIB_VERSION)
#elif defined(_LIBCPP_LIBC_NEWLIB)
char tmp_name[L_tmpnam];
char *ret = tmpnam(tmp_name);
if (ret == NULL) {
Expand Down
Loading