[libcxx-commits] [libcxx] 5f51fb3 - [libc++] Minor cleanups in <iterator>. NFCI.

[Arthur O'Dwyer via libcxx-commits]

Author: Arthur O'Dwyer
Date: 2021-04-30T08:52:58-04:00
New Revision: 5f51fb3421e0254f6d88673b61053bd485c13a41

URL: https://github.com/llvm/llvm-project/commit/5f51fb3421e0254f6d88673b61053bd485c13a41
DIFF: https://github.com/llvm/llvm-project/commit/5f51fb3421e0254f6d88673b61053bd485c13a41.diff

LOG: [libc++] Minor cleanups in <iterator>. NFCI.

Added: 
    

Modified: 
    libcxx/include/iterator

Removed: 
    


################################################################################
diff  --git a/libcxx/include/iterator b/libcxx/include/iterator
index 918c96d8cbefd..5be87e155a8c9 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -454,25 +454,23 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
 */
 
 #include <__config>
-#include <iosfwd> // for forward declarations of vector and string.
+#include <__debug>
 #include <__functional_base>
-#include <type_traits>
-#include <compare>
-#include <concepts> // Mandated by the Standard.
-#include <cstddef>
-#include <initializer_list>
 #include <__iterator/concepts.h>
 #include <__iterator/incrementable_traits.h>
 #include <__iterator/iter_move.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/readable_traits.h>
-#include <__iterator/concepts.h>
 #include <__memory/addressof.h>
 #include <__memory/pointer_traits.h>
+#include <compare>
+#include <concepts> // Mandated by the Standard.
+#include <cstddef>
+#include <initializer_list>
+#include <iosfwd> // for forward declarations of vector and string
+#include <type_traits>
 #include <version>
 
-#include <__debug>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
@@ -1455,11 +1453,6 @@ private:
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     __wrap_iter<_Iter1>
     operator+(typename __wrap_iter<_Iter1>::
diff erence_type, __wrap_iter<_Iter1>) _NOEXCEPT;
-
-    template <class _Ip, class _Op> friend _LIBCPP_CONSTEXPR_AFTER_CXX17 _Op copy(_Ip, _Ip, _Op);
-    template <class _B1, class _B2> friend _LIBCPP_CONSTEXPR_AFTER_CXX17 _B2 copy_backward(_B1, _B1, _B2);
-    template <class _Ip, class _Op> friend _LIBCPP_CONSTEXPR_AFTER_CXX17 _Op move(_Ip, _Ip, _Op);
-    template <class _B1, class _B2> friend _LIBCPP_CONSTEXPR_AFTER_CXX17 _B2 move_backward(_B1, _B1, _B2);
 };
 
 #if _LIBCPP_STD_VER <= 17