Rework includes

NVIDIA · Dec 19, 2022 · c190127 · c190127
1 parent 3e1aed2
commit c190127
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 132 deletions.
diff --git a/include/cuda/std/detail/libcxx/include/__functional/reference_wrapper.h b/include/cuda/std/detail/libcxx/include/__functional/reference_wrapper.h
@@ -12,14 +12,11 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__functional/weak_result_type.h>
-#include <__memory/addressof.h>
-#include <type_traits>
-#else
-#include "weak_result_type.h"
-#include "../__memory/addressof.h"
 #endif // __cuda_std__
 
+#include "../__functional/weak_result_type.h"
+#include "../__memory/addressof.h"
+
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif

diff --git a/include/cuda/std/detail/libcxx/include/__functional/weak_result_type.h b/include/cuda/std/detail/libcxx/include/__functional/weak_result_type.h
@@ -12,14 +12,15 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__functional/binary_function.h>
-#include <__functional/unary_function.h>
-#include <type_traits>
-#else
-#include "binary_function.h"
-#include "unary_function.h"
 #endif // __cuda_std__
 
+#include "../__functional/binary_function.h"
+#include "../__functional/invoke.h"
+#include "../__functional/unary_function.h"
+#include "../__type_traits/integral_constant.h"
+#include "../__type_traits/is_same.h"
+#include "../__utility/declval.h"
+
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/advance.h b/include/cuda/std/detail/libcxx/include/__iterator/advance.h
@@ -13,13 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator_traits.h>
 #include <cassert>
 #include <cstdlib>
-#else
-#include "iterator_traits.h"
 #endif // __cuda_std__
 
+#include "../__iterator/iterator_traits.h"
+
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/back_insert_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/back_insert_iterator.h
@@ -13,15 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__memory/addressof.h>
-#include <__utility/move.h>
 #include <cstddef>
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__memory/addressof.h"
 #include "../__utility/move.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/distance.h b/include/cuda/std/detail/libcxx/include/__iterator/distance.h
@@ -13,11 +13,10 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator_traits.h>
-#else
-#include "../__iterator/iterator_traits.h"
 #endif // __cuda_std__
 
+#include "../__iterator/iterator_traits.h"
+
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/front_insert_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/front_insert_iterator.h
@@ -13,17 +13,13 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__iterator/iterator_traits.h>
-#include <__memory/addressof.h>
-#include <__utility/move.h>
 #include <cstddef>
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__iterator/iterator_traits.h"
 #include "../__memory/addressof.h"
 #include "../__utility/move.h"
-#endif
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/insert_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/insert_iterator.h
@@ -13,15 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__memory/addressof.h>
-#include <__utility/move.h>
 #include <cstddef>
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__memory/addressof.h"
 #include "../__utility/move.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/istream_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/istream_iterator.h
@@ -13,14 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__memory/addressof.h>
 #include <cstddef>
 #include <iosfwd> // for forward declarations of char_traits and basic_istream
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__memory/addressof.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/istreambuf_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/istreambuf_iterator.h
@@ -13,13 +13,11 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__iterator/iterator_traits.h>
 #include <iosfwd> // for forward declaration of basic_streambuf
-#else
+#endif //__cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__iterator/iterator_traits.h"
-#endif //__cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h b/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h
@@ -13,19 +13,14 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__fwd/pair.h>
-#include <__type_traits/add_const.h>
-#include <__type_traits/is_convertible.h>
-#include <__type_traits/remove_cv.h>
-#include <__type_traits/void_t.h>
 #include <cstddef>
-#else
+#endif // __cuda_std__
+
 #include "../__fwd/pair.h"
 #include "../__type_traits/add_const.h"
 #include "../__type_traits/is_convertible.h"
 #include "../__type_traits/remove_cv.h"
 #include "../__type_traits/void_t.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/move_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/move_iterator.h
@@ -14,18 +14,13 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator_traits.h>
-#include <__type_traits/conditional.h>
-#include <__type_traits/is_reference.h>
-#include <__type_traits/remove_reference.h>
-#include <__utility/move.h>
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator_traits.h"
 #include "../__type_traits/conditional.h"
 #include "../__type_traits/is_reference.h"
 #include "../__type_traits/remove_reference.h"
 #include "../__utility/move.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/next.h b/include/cuda/std/detail/libcxx/include/__iterator/next.h
@@ -13,15 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/advance.h>
-#include <__iterator/iterator_traits.h>
-#include <__type_traits/enable_if.h>
 #include <cassert>
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/advance.h"
 #include "../__iterator/iterator_traits.h"
 #include "../__type_traits/enable_if.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/ostream_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/ostream_iterator.h
@@ -13,14 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__memory/addressof.h>
 #include <cstddef>
 #include <iosfwd> // for forward declarations of char_traits and basic_ostream
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__memory/addressof.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/ostreambuf_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/ostreambuf_iterator.h
@@ -13,14 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__iterator/iterator_traits.h>
 #include <cstddef>
 #include <iosfwd> // for forward declaration of basic_streambuf
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__iterator/iterator_traits.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/prev.h b/include/cuda/std/detail/libcxx/include/__iterator/prev.h
@@ -13,15 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/advance.h>
-#include <__iterator/iterator_traits.h>
-#include <__type_traits/enable_if.h>
 #include <cassert>
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/advance.h"
 #include "../__iterator/iterator_traits.h"
 #include "../__type_traits/enable_if.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/reverse_access.h b/include/cuda/std/detail/libcxx/include/__iterator/reverse_access.h
@@ -13,13 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/reverse_iterator.h>
 #include <cstddef>
 #include <initializer_list>
-#else
-#include "../__iterator/reverse_iterator.h"
 #endif // __cuda_std__
 
+#include "../__iterator/reverse_iterator.h"
+
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/reverse_iterator.h b/include/cuda/std/detail/libcxx/include/__iterator/reverse_iterator.h
@@ -13,16 +13,12 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__iterator/iterator.h>
-#include <__iterator/iterator_traits.h>
-#include <__memory/addressof.h>
-#include <__type_traits/void_t.h>
-#else
+#endif // __cuda_std__
+
 #include "../__iterator/iterator.h"
 #include "../__iterator/iterator_traits.h"
 #include "../__memory/addressof.h"
 #include "../__type_traits/void_t.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/size.h b/include/cuda/std/detail/libcxx/include/__iterator/size.h
@@ -14,12 +14,10 @@
 #ifndef __cuda_std__
 #include <__config>
 #include <cstddef>
-#include <__type_traits/common_type.h>
-#include <__type_traits/make_signed.h>
-#else
+#endif // __cuda_std__
+
 #include "../__type_traits/common_type.h"
 #include "../__type_traits/make_signed.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/include/cuda/std/detail/libcxx/include/__iterator/wrap_iter.h b/include/cuda/std/detail/libcxx/include/__iterator/wrap_iter.h
@@ -13,22 +13,15 @@
 
 #ifndef __cuda_std__
 #include <__config>
-#include <__debug>
-#include <__iterator/iterator_traits.h>
-#include <__memory/addressof.h>
-#include <__memory/pointer_traits.h>
-#include <__type_traits/enable_if.h>
-#include <__type_traits/is_convertible.h>
-#include <__type_traits/is_trivially_copy_assignable.h>
-#else
+#endif // __cuda_std__
+
 #include "../__debug"
 #include "../__iterator/iterator_traits.h"
 #include "../__memory/addressof.h"
 #include "../__memory/pointer_traits.h"
 #include "../__type_traits/enable_if.h"
 #include "../__type_traits/is_convertible.h"
 #include "../__type_traits/is_trivially_copy_assignable.h"
-#endif // __cuda_std__
 
 #if defined(_LIBCUDACXX_USE_PRAGMA_GCC_SYSTEM_HEADER)
 #pragma GCC system_header