From eb2692571fab1cc9996c0b972aee5e1c48ae0989 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Tue, 10 Aug 2010 20:48:29 +0000
Subject: patch by Jesse Towner, and bug fix by Sebastian Redl

llvm-svn: 110724
---
 libcxx/include/thread | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'libcxx/include/thread')

diff --git a/libcxx/include/thread b/libcxx/include/thread
index 5fcd2c988de..6bf3189294f 100644
--- a/libcxx/include/thread
+++ b/libcxx/include/thread
@@ -178,9 +178,12 @@ class thread
 {
     pthread_t __t_;
 
-#ifndef _LIBCPP_MOVE
-    thread(const thread&); // = delete;
-    thread& operator=(const thread&); // = delete;
+#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
+    thread(const thread&) = delete;
+    thread& operator=(const thread&) = delete;
+#else
+    thread(const thread&);
+    thread& operator=(const thread&);
 #endif
 public:
     typedef __thread_id id;
@@ -201,9 +204,7 @@ public:
     ~thread();
 
 #ifdef _LIBCPP_MOVE
-    thread(const thread&) = delete;
     thread(thread&& __t) : __t_(__t.__t_) {__t.__t_ = 0;}
-    thread& operator=(const thread&) = delete;
     thread& operator=(thread&& __t);
 #endif
 
-- 
cgit v1.2.3