OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Address some post-commit review comments on r217261 

llvm-svn: 217276
This commit is contained in:
Jonathan Roelofs 2014-09-05 20:28:44 +00:00
parent bb1c918ec8
commit afe6794bc2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/include/future
View File

@ -374,7 +374,7 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#ifndef _LIBCPP_HAS_NO_THREADS #ifdef _LIBCPP_HAS_NO_THREADS
#error <future> is not supported on this single threaded system #error <future> is not supported on this single threaded system
#else // !_LIBCPP_HAS_NO_THREADS #else // !_LIBCPP_HAS_NO_THREADS

4
libcxx/include/ios
View File

@ -216,7 +216,7 @@ storage-class-specifier const error_category& iostream_category() noexcept;
#include <__locale> #include <__locale>
#include <system_error> #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_ #include <atomic> // for __xindex_
#endif #endif
@ -367,7 +367,7 @@ private:
int* __index_; int* __index_;
size_t __event_size_; size_t __event_size_;
size_t __event_cap_; 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_; static atomic<int> __xindex_;
#else #else
static int __xindex_; static int __xindex_;

2
libcxx/src/ios.cpp
View File

@ -148,7 +148,7 @@ ios_base::getloc() const
} }
// xalloc // 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); atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0);
#else #else
int ios_base::__xindex_ = 0; int ios_base::__xindex_ = 0;

2
libcxx/src/memory.cpp
View File

@ -121,7 +121,7 @@ __shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT
#endif // _LIBCPP_NO_RTTI #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 const std::size_t __sp_mut_count = 16;
static pthread_mutex_t mut_back_imp[__sp_mut_count] = static pthread_mutex_t mut_back_imp[__sp_mut_count] =