From edc0ee3ccad416ab186202bf928ea64e3a7987b7 Mon Sep 17 00:00:00 2001
From: Mark de Wever <koraq@xs4all.nl>
Date: Fri, 28 Jul 2023 17:44:06 +0200
Subject: [libc++][modules] Fixes exporting named declarations.

@ChuanqiXu noticed std::atomic was not properly exported in the std module.
Investigation showed other named declarations were not exported either. This
fixes the issue.

Depends on D156550

Reviewed By: #libc, philnik

Differential Revision: https://reviews.llvm.org/D156592

(cherry picked from commit e57f6f709ed2ebef7852bebb47baaf202962b4ee)
---
 libcxx/modules/std/atomic.cppm     | 3 ---
 libcxx/modules/std/execution.cppm  | 2 +-
 libcxx/modules/std/filesystem.cppm | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libcxx/modules/std/atomic.cppm b/libcxx/modules/std/atomic.cppm
index 9c19484..faf902b 100644
--- a/libcxx/modules/std/atomic.cppm
+++ b/libcxx/modules/std/atomic.cppm
@@ -23,9 +23,6 @@ export namespace std {
   using std::memory_order_seq_cst;
 
   using std::kill_dependency;
-} // namespace std
-
-namespace std {
 
   // [atomics.ref.generic], class template atomic_ref
   // [atomics.ref.pointer], partial specialization for pointers
diff --git a/libcxx/modules/std/execution.cppm b/libcxx/modules/std/execution.cppm
index 6ea12c0..e0996f3 100644
--- a/libcxx/modules/std/execution.cppm
+++ b/libcxx/modules/std/execution.cppm
@@ -17,7 +17,7 @@ export namespace std {
   using std::is_execution_policy_v;
 } // namespace std
 
-namespace std::execution {
+export namespace std::execution {
   // [execpol.seq], sequenced execution policy
   using std::execution::sequenced_policy;
 
diff --git a/libcxx/modules/std/filesystem.cppm b/libcxx/modules/std/filesystem.cppm
index ea8136b..c6dac36 100644
--- a/libcxx/modules/std/filesystem.cppm
+++ b/libcxx/modules/std/filesystem.cppm
@@ -110,11 +110,11 @@ export namespace std::filesystem {
 } // namespace std::filesystem
 
 // [fs.path.hash], hash support
-namespace std {
+export namespace std {
   using std::hash;
 }
 
-namespace std::ranges {
+export namespace std::ranges {
   using std::ranges::enable_borrowed_range;
   using std::ranges::enable_view;
 } // namespace std::ranges
-- 
cgit v1.1