Merge pull request #6421 from Arthapz/improve-libstdc++-module

(C++ modules support) improve std module support for gcc and clang

3 files changed, 8 insertions, 8 deletions

diff --git a/tests/projects/c++/modules/stdmodules_deps/src/bar.mpp b/tests/projects/c++/modules/stdmodules_deps/src/bar.mpp
index 79d91a393..001cd7c2d 100644
--- a/tests/projects/c++/modules/stdmodules_deps/src/bar.mpp
+++ b/tests/projects/c++/modules/stdmodules_deps/src/bar.mpp
@@ -4,8 +4,11 @@ import std;
 
 export auto my_sum2(std::size_t a, std::size_t b) -> std::size_t;
 
+#if defined(__GNUC__) && !defined(__clang__)
+inline
+#else
 module :private;
-
-auto my_sum2(std::size_t a, std::size_t b) -> std::size_t {
+#endif
+    auto my_sum2(std::size_t a, std::size_t b) -> std::size_t {
   return a + a + b + b;
 }
diff --git a/tests/projects/c++/modules/stdmodules_deps/src/foo.cpp b/tests/projects/c++/modules/stdmodules_deps/src/foo.cpp
new file mode 100644
index 000000000..c1e34dec6
--- /dev/null
+++ b/tests/projects/c++/modules/stdmodules_deps/src/foo.cpp
@@ -0,0 +1,3 @@
+module foo;
+
+auto my_sum(std::size_t a, std::size_t b) -> std::size_t { return a + b; }
diff --git a/tests/projects/c++/modules/stdmodules_deps/src/foo.mpp b/tests/projects/c++/modules/stdmodules_deps/src/foo.mpp
index 17a3795b7..b0aab2fee 100644
--- a/tests/projects/c++/modules/stdmodules_deps/src/foo.mpp
+++ b/tests/projects/c++/modules/stdmodules_deps/src/foo.mpp
@@ -3,9 +3,3 @@ export module foo;
 import std;
 
 export auto my_sum(std::size_t a, std::size_t b) -> std::size_t;
-
-module :private;
-
-auto my_sum(std::size_t a, std::size_t b) -> std::size_t {
-  return a + b;
-}