generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restrict optimized __pad_and_output implementation detail to desired releases.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@167980 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant
2012-11-14 21:17:15 +00:00
parent faa17162e9
commit 537b2fa6b8
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/iterator
View File

@@ -317,6 +317,10 @@ template <class T, size_t N> T* end(T (&array)[N]);
#include <type_traits> #include <type_traits>
#include <cstddef> #include <cstddef>
#include <iosfwd> #include <iosfwd>
#if __APPLE__
#include <Availability.h>
#endif
#ifdef _LIBCPP_DEBUG #ifdef _LIBCPP_DEBUG
#include <cassert> #include <cassert>
#endif #endif
@@ -882,6 +886,10 @@ public:
_LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator++(int) {return *this;} _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator++(int) {return *this;}
_LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;} _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
#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 _Ch, class _Tr> template <class _Ch, class _Tr>
friend friend
_LIBCPP_HIDDEN _LIBCPP_HIDDEN
@@ -889,6 +897,7 @@ public:
__pad_and_output(ostreambuf_iterator<_Ch, _Tr> __s, __pad_and_output(ostreambuf_iterator<_Ch, _Tr> __s,
const _Ch* __ob, const _Ch* __op, const _Ch* __oe, const _Ch* __ob, const _Ch* __op, const _Ch* __oe,
ios_base& __iob, _Ch __fl); ios_base& __iob, _Ch __fl);
#endif
}; };
template <class _Iter> template <class _Iter>

10
include/locale
View File

@@ -192,6 +192,10 @@ template <class charT> class messages_byname;
#include <nl_types.h> #include <nl_types.h>
#endif // !_WIN32 #endif // !_WIN32
#if __APPLE__
#include <Availability.h>
#endif
#include <__undef_min_max> #include <__undef_min_max>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -1587,6 +1591,10 @@ __pad_and_output(_OutputIterator __s,
return __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> template <class _CharT, class _Traits>
_LIBCPP_HIDDEN _LIBCPP_HIDDEN
ostreambuf_iterator<_CharT, _Traits> ostreambuf_iterator<_CharT, _Traits>
@@ -1633,6 +1641,8 @@ __pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s,
return __s; return __s;
} }
#endif
template <class _CharT, class _OutputIterator> template <class _CharT, class _OutputIterator>
_OutputIterator _OutputIterator
num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob, num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,