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 /libcxx/include | |
| parent | bb1c918ec85f24457a4aeb47a08683df34063916 (diff) | |
| download | llvm-afe6794bc2ee35880e970e7e9fcde6c2ad72b51b.zip llvm-afe6794bc2ee35880e970e7e9fcde6c2ad72b51b.tar.gz llvm-afe6794bc2ee35880e970e7e9fcde6c2ad72b51b.tar.bz2 | |
Address some post-commit review comments on r217261
llvm-svn: 217276
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/future | 2 | ||||
| -rw-r--r-- | libcxx/include/ios | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/future b/libcxx/include/future index 7cd88cb..83513fa 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 6d42607..ff79998 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_; |