diff options
author | Vitaly Buka <vitalybuka@google.com> | 2022-09-02 19:35:10 -0700 |
---|---|---|
committer | Vitaly Buka <vitalybuka@google.com> | 2022-09-02 19:42:49 -0700 |
commit | bc8fd9c6335f37edb3a56a628f38c0bbf96367ad (patch) | |
tree | ac5f9e90b96849c924de60a27a8700c4c359af75 /libcxx/include/algorithm | |
parent | 211817d3be936ddd25f532e74e41bdaedfe82850 (diff) | |
download | llvm-bc8fd9c6335f37edb3a56a628f38c0bbf96367ad.zip llvm-bc8fd9c6335f37edb3a56a628f38c0bbf96367ad.tar.gz llvm-bc8fd9c6335f37edb3a56a628f38c0bbf96367ad.tar.bz2 |
Revert "[libc++] Granularize the rest of memory"
Breaks buildbots.
This reverts commit 30adaa730c4768b5eb06719c808b2884fcf53cf3.
Diffstat (limited to 'libcxx/include/algorithm')
-rw-r--r-- | libcxx/include/algorithm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 0dd8002..0b54fb9 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1709,6 +1709,7 @@ template <class BidirectionalIterator, class Compare> #include <__debug> #include <cstddef> #include <cstring> +#include <memory> #include <type_traits> #include <version> @@ -1903,11 +1904,7 @@ template <class BidirectionalIterator, class Compare> #endif #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include <atomic> -# include <chrono> # include <iterator> -# include <memory> -# include <stdexcept> # include <utility> #endif @@ -1919,7 +1916,7 @@ template <class BidirectionalIterator, class Compare> #endif #if defined(_LIBCPP_HAS_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17 -# include <__pstl_algorithm> +# include <__pstl_algorithm> #endif #endif // _LIBCPP_ALGORITHM |