[libcxx-commits] [libcxx] 8383351 - [libc++] Remove conditional include

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2022-05-25T10:04:54-04:00
New Revision: 8383351d45179ecb544f859919dbc798ac9a91ea

URL: https://github.com/llvm/llvm-project/commit/8383351d45179ecb544f859919dbc798ac9a91ea
DIFF: https://github.com/llvm/llvm-project/commit/8383351d45179ecb544f859919dbc798ac9a91ea.diff

LOG: [libc++] Remove conditional include

Added: 
    

Modified: 
    libcxx/include/barrier
    libcxx/src/barrier.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/include/barrier b/libcxx/include/barrier
index f03c089a14b9..9d91d255df9a 100644
--- a/libcxx/include/barrier
+++ b/libcxx/include/barrier
@@ -51,9 +51,7 @@ namespace std
 #include <__thread/timed_backoff_policy.h>
 #include <atomic>
 #include <limits>
-#ifndef _LIBCPP_HAS_NO_TREE_BARRIER
-# include <memory>
-#endif
+#include <memory>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -280,7 +278,7 @@ public:
     }
 };
 
-#endif //_LIBCPP_HAS_NO_TREE_BARRIER
+#endif // !_LIBCPP_HAS_NO_TREE_BARRIER
 
 template<class _CompletionF = __empty_completion>
 class barrier {

diff  --git a/libcxx/src/barrier.cpp b/libcxx/src/barrier.cpp
index 54890b2d797e..8ce2c043cf81 100644
--- a/libcxx/src/barrier.cpp
+++ b/libcxx/src/barrier.cpp
@@ -90,7 +90,7 @@ void __destroy_barrier_algorithm_base(__barrier_algorithm_base* __barrier)
     delete __barrier;
 }
 
-#endif //!defined(_LIBCPP_HAS_NO_TREE_BARRIER)
+#endif // !defined(_LIBCPP_HAS_NO_TREE_BARRIER)
 
 _LIBCPP_END_NAMESPACE_STD