[libcxx] r217276 - Address some post-commit review comments on r217261

[Jonathan Roelofs]

Author: jroelofs
Date: Fri Sep  5 15:28:44 2014
New Revision: 217276

URL: http://llvm.org/viewvc/llvm-project?rev=217276&view=rev
Log:
Address some post-commit review comments on r217261

Modified:
    libcxx/trunk/include/future
    libcxx/trunk/include/ios
    libcxx/trunk/src/ios.cpp
    libcxx/trunk/src/memory.cpp

Modified: libcxx/trunk/include/future
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/future?rev=217276&r1=217275&r2=217276&view=diff
==============================================================================
--- libcxx/trunk/include/future (original)
+++ libcxx/trunk/include/future Fri Sep  5 15:28:44 2014
@@ -374,7 +374,7 @@ template <class R, class Alloc> struct u
 #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
 

Modified: libcxx/trunk/include/ios
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ios?rev=217276&r1=217275&r2=217276&view=diff
==============================================================================
--- libcxx/trunk/include/ios (original)
+++ libcxx/trunk/include/ios Fri Sep  5 15:28:44 2014
@@ -216,7 +216,7 @@ storage-class-specifier const error_cate
 #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_;

Modified: libcxx/trunk/src/ios.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/ios.cpp?rev=217276&r1=217275&r2=217276&view=diff
==============================================================================
--- libcxx/trunk/src/ios.cpp (original)
+++ libcxx/trunk/src/ios.cpp Fri Sep  5 15:28:44 2014
@@ -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;

Modified: libcxx/trunk/src/memory.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/memory.cpp?rev=217276&r1=217275&r2=217276&view=diff
==============================================================================
--- libcxx/trunk/src/memory.cpp (original)
+++ libcxx/trunk/src/memory.cpp Fri Sep  5 15:28:44 2014
@@ -121,7 +121,7 @@ __shared_weak_count::__get_deleter(const
 
 #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] =