diff options
| author | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-05 20:28:44 +0000 |
|---|---|---|
| committer | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-05 20:28:44 +0000 |
| commit | afe6794bc2ee35880e970e7e9fcde6c2ad72b51b (patch) | |
| tree | 650d5a150f0d3ff90f77bae7c8c9306e841c19b2 | |
| parent | bb1c918ec85f24457a4aeb47a08683df34063916 (diff) | |
| download | bcm5719-llvm-afe6794bc2ee35880e970e7e9fcde6c2ad72b51b.tar.gz bcm5719-llvm-afe6794bc2ee35880e970e7e9fcde6c2ad72b51b.zip | |
Address some post-commit review comments on r217261
llvm-svn: 217276
| -rw-r--r-- | libcxx/include/future | 2 | ||||
| -rw-r--r-- | libcxx/include/ios | 4 | ||||
| -rw-r--r-- | libcxx/src/ios.cpp | 2 | ||||
| -rw-r--r-- | libcxx/src/memory.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/include/future b/libcxx/include/future index 7cd88cb726b..83513fa693d 100644 --- a/libcxx/include/future +++ b/libcxx/include/future @@ -374,7 +374,7 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>; #pragma GCC system_header #endif -#ifndef _LIBCPP_HAS_NO_THREADS +#ifdef _LIBCPP_HAS_NO_THREADS #error <future> is not supported on this single threaded system #else // !_LIBCPP_HAS_NO_THREADS diff --git a/libcxx/include/ios b/libcxx/include/ios index 6d426079d4f..ff79998b0bb 100644 --- a/libcxx/include/ios +++ b/libcxx/include/ios @@ -216,7 +216,7 @@ storage-class-specifier const error_category& iostream_category() noexcept; #include <__locale> #include <system_error> -#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS +#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS) #include <atomic> // for __xindex_ #endif @@ -367,7 +367,7 @@ private: int* __index_; size_t __event_size_; size_t __event_cap_; -#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS +#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS) static atomic<int> __xindex_; #else static int __xindex_; diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp index 0bd500bf3c2..06426c7b604 100644 --- a/libcxx/src/ios.cpp +++ b/libcxx/src/ios.cpp @@ -148,7 +148,7 @@ ios_base::getloc() const } // xalloc -#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS +#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS) atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0); #else int ios_base::__xindex_ = 0; diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp index 31e823cf419..c56d031adfb 100644 --- a/libcxx/src/memory.cpp +++ b/libcxx/src/memory.cpp @@ -121,7 +121,7 @@ __shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT #endif // _LIBCPP_NO_RTTI -#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS +#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS) static const std::size_t __sp_mut_count = 16; static pthread_mutex_t mut_back_imp[__sp_mut_count] = |
