[libc++] Rename __tuple to __tuple_dir to avoid file collision
Rename the `__tuple` directory in libc++ headers to `__tuple_dir`
to avoid file collision when installing. Historically, `__tuple` has
been a file and it has been replaced by a directory
in 2d52c6bfae801b016dd3627b8c0e7c4a99405549. Replacing a regular file
with a directory (or more importantly, the other way around when
downgrading) is not universally supported. Since this is an internal
header, its actual name should not matter, so just rename it to avoid
problems.
Differential Revision: https://reviews.llvm.org/D139270
NOKEYCHECK=True
GitOrigin-RevId: ec11388b3342a2b22eae22fd13ff4997b103d155
diff --git a/include/module.modulemap.in b/include/module.modulemap.in
index 2a2064c..c0473a4 100644
--- a/include/module.modulemap.in
+++ b/include/module.modulemap.in
@@ -1342,16 +1342,16 @@
header "tuple"
export *
- module apply_cv { private header "__tuple/apply_cv.h" }
+ module apply_cv { private header "__tuple_dir/apply_cv.h" }
module get_fwd { private header "__fwd/get.h" }
- module make_tuple_types { private header "__tuple/make_tuple_types.h" }
- module sfinae_helpers { private header "__tuple/sfinae_helpers.h" }
- module tuple_element { private header "__tuple/tuple_element.h" }
+ module make_tuple_types { private header "__tuple_dir/make_tuple_types.h" }
+ module sfinae_helpers { private header "__tuple_dir/sfinae_helpers.h" }
+ module tuple_element { private header "__tuple_dir/tuple_element.h" }
module tuple_fwd { private header "__fwd/tuple.h" }
- module tuple_indices { private header "__tuple/tuple_indices.h" }
- module tuple_like { private header "__tuple/tuple_like.h" }
- module tuple_size { private header "__tuple/tuple_size.h" }
- module tuple_types { private header "__tuple/tuple_types.h" }
+ module tuple_indices { private header "__tuple_dir/tuple_indices.h" }
+ module tuple_like { private header "__tuple_dir/tuple_like.h" }
+ module tuple_size { private header "__tuple_dir/tuple_size.h" }
+ module tuple_types { private header "__tuple_dir/tuple_types.h" }
}
module type_traits {
header "type_traits"