Bläddra i källkod

[libc++] Unconditionally enable the __pad_and_output optimization

This used to be guarded on whether the deployment target was greater
than macosx10.8, however testing against the dylibs for 10.8 and earlier
with the function enabled works too. The revision that introduced
__pad_and_output is r164241 and it does not mention a reason for the
guard.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@358677 91177308-0d34-0410-b5e6-96231b3b80d8
Louis Dionne 6 år sedan
förälder
incheckning
b6402fd7f2
2 ändrade filer med 0 tillägg och 11 borttagningar
  1. 0 5
      include/iterator
  2. 0 6
      include/locale

+ 0 - 5
include/iterator

@@ -1090,10 +1090,6 @@ 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
@@ -1101,7 +1097,6 @@ 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>

+ 0 - 6
include/locale

@@ -1372,10 +1372,6 @@ __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>
@@ -1422,8 +1418,6 @@ __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,