diff options
| author | theraven <theraven@FreeBSD.org> | 2012-11-29 13:35:44 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-11-29 13:35:44 +0000 |
| commit | 58e590440b4a1ca9d0fd818f1d8464be99faaec1 (patch) | |
| tree | 357bbfe8456d0ad63bf211df5cdd7d3517eddb9a /contrib/libc++/include/locale | |
| parent | d574f08958e7b126237df7fdcc775cc559fe4267 (diff) | |
| download | FreeBSD-src-58e590440b4a1ca9d0fd818f1d8464be99faaec1.zip FreeBSD-src-58e590440b4a1ca9d0fd818f1d8464be99faaec1.tar.gz | |
Merge new libc++ into head.
Diffstat (limited to 'contrib/libc++/include/locale')
| -rw-r--r-- | contrib/libc++/include/locale | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/contrib/libc++/include/locale b/contrib/libc++/include/locale index 976c4cf..f04a36b 100644 --- a/contrib/libc++/include/locale +++ b/contrib/libc++/include/locale @@ -192,6 +192,10 @@ template <class charT> class messages_byname; #include <nl_types.h> #endif // !_WIN32 +#if __APPLE__ +#include <Availability.h> +#endif + #include <__undef_min_max> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -1587,6 +1591,10 @@ __pad_and_output(_OutputIterator __s, return __s; } +#if !defined(__APPLE__) || \ + (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \ + (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0) + template <class _CharT, class _Traits> _LIBCPP_HIDDEN ostreambuf_iterator<_CharT, _Traits> @@ -1633,6 +1641,8 @@ __pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s, return __s; } +#endif + template <class _CharT, class _OutputIterator> _OutputIterator num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob, |
