diff options
| author | Mike Hommey <mh@glandium.org> | 2023-03-23 17:09:00 +0000 |
|---|---|---|
| committer | Michael Platings <michael.platings@arm.com> | 2023-03-23 17:30:34 +0000 |
| commit | 101cfe18f7b80801be3e415ad62acfc57960ad90 (patch) | |
| tree | 2f231aa369eb9da83883eea3c13d5b356f7de60f /libcxx | |
| parent | 40aaa272f145e633b29d5e70a4590cc425801f7e (diff) | |
| download | llvm-101cfe18f7b80801be3e415ad62acfc57960ad90.zip llvm-101cfe18f7b80801be3e415ad62acfc57960ad90.tar.gz llvm-101cfe18f7b80801be3e415ad62acfc57960ad90.tar.bz2 | |
[libcxx] Fix build bustage with threads disabled
Building with -DLIBCXX_ENABLE_THREADS=OFF -DLIBCXXABI_ENABLE_THREADS=OFF
(like e.g. for wasm) fails after D146228 because of a misplaced std
namespace begin/end.
Reviewed By: philnik, #libc
Differential Revision: https://reviews.llvm.org/D146682
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/__condition_variable/condition_variable.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/__condition_variable/condition_variable.h b/libcxx/include/__condition_variable/condition_variable.h index e66f787..926effb 100644 --- a/libcxx/include/__condition_variable/condition_variable.h +++ b/libcxx/include/__condition_variable/condition_variable.h @@ -29,10 +29,10 @@ _LIBCPP_PUSH_MACROS #include <__undef_macros> -#ifndef _LIBCPP_HAS_NO_THREADS - _LIBCPP_BEGIN_NAMESPACE_STD +#ifndef _LIBCPP_HAS_NO_THREADS + // enum class cv_status _LIBCPP_DECLARE_STRONG_ENUM(cv_status){no_timeout, timeout}; _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status) @@ -234,10 +234,10 @@ inline void condition_variable::__do_timed_wait(unique_lock<mutex>& __lk, wait_for(__lk, __tp - _Clock::now()); } -_LIBCPP_END_NAMESPACE_STD - #endif // _LIBCPP_HAS_NO_THREADS +_LIBCPP_END_NAMESPACE_STD + _LIBCPP_POP_MACROS #endif // _LIBCPP___CONDITION_VARIABLE_CONDITION_VARIABLE_H |