diff options
Diffstat (limited to 'current/sources/cxx-stl/llvm-libc++/include')
| -rw-r--r-- | current/sources/cxx-stl/llvm-libc++/include/complex | 8 | ||||
| -rw-r--r-- | current/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/current/sources/cxx-stl/llvm-libc++/include/complex b/current/sources/cxx-stl/llvm-libc++/include/complex index 92295be97..36c66db50 100644 --- a/current/sources/cxx-stl/llvm-libc++/include/complex +++ b/current/sources/cxx-stl/llvm-libc++/include/complex @@ -244,6 +244,7 @@ template<class T, class charT, class traits> #include <stdexcept> #include <cmath> #include <iosfwd> +#include <sstream> #include <version> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -1441,7 +1442,12 @@ template<class _Tp, class _CharT, class _Traits> basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x) { - return __os << '(' << __x.real() << ',' << __x.imag() << ')'; + basic_ostringstream<_CharT, _Traits> __s; + __s.flags(__os.flags()); + __s.imbue(__os.getloc()); + __s.precision(__os.precision()); + __s << '(' << __x.real() << ',' << __x.imag() << ')'; + return __os << __s.str(); } #if _LIBCPP_STD_VER > 11 diff --git a/current/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h b/current/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h index dd1c088f4..b49baea05 100644 --- a/current/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h +++ b/current/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h @@ -25,21 +25,15 @@ extern "C" { #if defined(__ANDROID__) +#include <android/api-level.h> #if __ANDROID_API__ < 21 #include <support/xlocale/__posix_l_fallback.h> #endif -// HACK: Not in upstream NDK or libc++. -// Upstream now supports using ToT libc++ with old NDKs, but as such it is now -// *only* compatible with the NDK. That will need to be fixed both for the -// platorm and for the NDK-in-platform use case since neither has -// android/ndk-version.h. - // If we do not have this header, we are in a platform build rather than an NDK // build, which will always be at least as new as the ToT NDK, in which case we // don't need any of the inlines below since libc provides them. #if __has_include(<android/ndk-version.h>) -#include <android/api-level.h> #include <android/ndk-version.h> // In NDK versions later than 16, locale-aware functions are provided by // legacy_stdlib_inlines.h |