diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-09-23 00:15:06 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-09-23 00:15:06 +0200 |
| commit | ec70a874827fc39500ff93f5aa5089059464bc41 (patch) | |
| tree | deb9684a666d58a7f40105a5caab9e9bd6d1e2ac | |
| parent | 63d2400a2c1cff42a8e3ea3d8b4c77b862c82bc7 (diff) | |
Undo modularization hacks for Clang that seem to be no longer necessary
| -rw-r--r-- | libbutl/filesystem.mxx | 2 | ||||
| -rw-r--r-- | libbutl/process.ixx | 6 | ||||
| -rw-r--r-- | libbutl/utility.mxx | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/libbutl/filesystem.mxx b/libbutl/filesystem.mxx index 271220f..b4caffe 100644 --- a/libbutl/filesystem.mxx +++ b/libbutl/filesystem.mxx @@ -30,7 +30,7 @@ #include <iterator> #include <functional> -#include <chrono> //@@ MOD needed by timestamp module. +#include <chrono> //@@ MOD needed by timestamp module (no re-export). #endif // Other includes. diff --git a/libbutl/process.ixx b/libbutl/process.ixx index c355855..fb076cf 100644 --- a/libbutl/process.ixx +++ b/libbutl/process.ixx @@ -40,14 +40,8 @@ namespace butl *args0_ = initial; initial = p.initial; - -#if defined(__cpp_modules) && defined(__clang__) //@@ MOD Clang ICE - recall = p.recall; - effect = p.effect; -#else recall = std::move (p.recall); effect = std::move (p.effect); -#endif args0_ = p.args0_; p.args0_ = nullptr; diff --git a/libbutl/utility.mxx b/libbutl/utility.mxx index d36b0d9..8ef0d08 100644 --- a/libbutl/utility.mxx +++ b/libbutl/utility.mxx @@ -7,9 +7,7 @@ #endif #ifndef _WIN32 -#if !defined(__cpp_lib_modules) || !defined(__clang__) //@@ MOD Clang ICE # include <strings.h> // strcasecmp(), strncasecmp() -#endif #else # include <string.h> // _stricmp(), _strnicmp() #endif |