diff options
| -rw-r--r-- | libbutl/diagnostics.cxx | 2 | ||||
| -rw-r--r-- | libbutl/fdstream.cxx | 1 | ||||
| -rw-r--r-- | libbutl/pager.cxx | 2 | ||||
| -rw-r--r-- | libbutl/process-details.hxx | 3 | ||||
| -rw-r--r-- | libbutl/process.cxx | 1 | ||||
| -rw-r--r-- | libbutl/regex.cxx | 2 | ||||
| -rw-r--r-- | libbutl/regex.mxx | 2 | ||||
| -rw-r--r-- | tests/fdstream/driver.cxx | 2 | ||||
| -rw-r--r-- | tests/progress/driver.cxx | 2 | ||||
| -rw-r--r-- | tests/regex/driver.cxx | 1 |
10 files changed, 11 insertions, 7 deletions
diff --git a/libbutl/diagnostics.cxx b/libbutl/diagnostics.cxx index 6189775..5183626 100644 --- a/libbutl/diagnostics.cxx +++ b/libbutl/diagnostics.cxx @@ -39,7 +39,7 @@ import std.io; #endif #endif -//@@ MOD TODO: std.threading +import std.threading; import butl.utility; import butl.optional; import butl.fdstream; // stderr_fd(), fdterm() diff --git a/libbutl/fdstream.cxx b/libbutl/fdstream.cxx index 905c36f..9eb810a 100644 --- a/libbutl/fdstream.cxx +++ b/libbutl/fdstream.cxx @@ -58,6 +58,7 @@ module butl.fdstream; #ifdef __cpp_lib_modules import std.core; import std.io; +import std.threading; // Clang wants it in purview (see process-details.hxx). #endif import butl.path; import butl.filesystem; diff --git a/libbutl/pager.cxx b/libbutl/pager.cxx index 6453120..5a45068 100644 --- a/libbutl/pager.cxx +++ b/libbutl/pager.cxx @@ -44,7 +44,7 @@ import butl.fdstream; #endif #ifndef _WIN32 -import std.core; //@@ MOD TODO: import std.threading. +import std.threading; #endif import butl.utility; // operator<<(ostream, exception), throw_generic_error() diff --git a/libbutl/process-details.hxx b/libbutl/process-details.hxx index adb33fd..2e8ea7f 100644 --- a/libbutl/process-details.hxx +++ b/libbutl/process-details.hxx @@ -7,7 +7,8 @@ #include <libbutl/ft/shared_mutex.hxx> #ifdef __cpp_lib_modules -import std.core; //@@ MOD std.threading +import std.core; //@@ MOD TMP (dummy std.threading). +import std.threading; #else #include <mutex> #if defined(__cpp_lib_shared_mutex) || defined(__cpp_lib_shared_timed_mutex) diff --git a/libbutl/process.cxx b/libbutl/process.cxx index e65018a..42655e8 100644 --- a/libbutl/process.cxx +++ b/libbutl/process.cxx @@ -78,6 +78,7 @@ module butl.process; #ifdef __cpp_lib_modules import std.core; import std.io; +import std.threading; // Clang wants it in purview (see process-details.hxx). #endif import butl.path; import butl.optional; diff --git a/libbutl/regex.cxx b/libbutl/regex.cxx index 1da325b..6159d54 100644 --- a/libbutl/regex.cxx +++ b/libbutl/regex.cxx @@ -30,7 +30,7 @@ module butl.regex; #ifdef __cpp_lib_modules import std.core; import std.io; -//@@ MOD TODO import std.regex; +import std.regex; #endif #endif diff --git a/libbutl/regex.mxx b/libbutl/regex.mxx index ca677a5..955c968 100644 --- a/libbutl/regex.mxx +++ b/libbutl/regex.mxx @@ -30,7 +30,7 @@ export module butl.regex; #ifdef __cpp_lib_modules import std.core; import std.io; -//@@ MOD TODO import std.regex; +import std.regex; // @@ MOD TODO should probably be re-exported. #endif #endif diff --git a/tests/fdstream/driver.cxx b/tests/fdstream/driver.cxx index dd70cff..59c042b 100644 --- a/tests/fdstream/driver.cxx +++ b/tests/fdstream/driver.cxx @@ -28,7 +28,7 @@ import std.core; import std.io; #ifndef _WIN32 -//@@ MOD TODO import std.threading; +import std.threading; #endif #endif import butl.path; diff --git a/tests/progress/driver.cxx b/tests/progress/driver.cxx index c8c2080..9bea4f7 100644 --- a/tests/progress/driver.cxx +++ b/tests/progress/driver.cxx @@ -27,7 +27,7 @@ import std.core; import std.io; #ifndef _WIN32 -//@@ MOD TODO import std.threading; +import std.threading; #endif #endif import butl.process; diff --git a/tests/regex/driver.cxx b/tests/regex/driver.cxx index d48b716..3f6129a 100644 --- a/tests/regex/driver.cxx +++ b/tests/regex/driver.cxx @@ -16,6 +16,7 @@ #ifdef __cpp_lib_modules import std.core; import std.io; +import std.regex; // @@ MOD TODO: shouldn't be necessary (re-export). #endif import butl.regex; import butl.utility; // operator<<(ostream, exception) |