[libcxx-commits] [PATCH] D146682: [libcxx] Fix build bustage with threads disabled

[Mike Hommey via Phabricator via libcxx-commits]

glandium created this revision.
glandium added a reviewer: philnik.
Herald added subscribers: mikhail.ramalho, sunfish.
Herald added a project: All.
glandium requested review of this revision.
Herald added subscribers: libcxx-commits, aheejin.
Herald added a project: libc++.
Herald added a reviewer: libc++.

Building with -DLIBCXX_ENABLE_THREADS=OFF -DLIBCXXABI_ENABLE_THREADS=OFF
(like e.g. for wasm) fails after D146228 <https://reviews.llvm.org/D146228> because of a misplaced std
namespace begin/end.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D146682

Files:
  libcxx/include/__condition_variable/condition_variable.h


Index: libcxx/include/__condition_variable/condition_variable.h
===================================================================
--- libcxx/include/__condition_variable/condition_variable.h
+++ 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 @@
   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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D146682.507576.patch
Type: text/x-patch
Size: 802 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230323/134cafbe/attachment.bin>