diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-08-10 20:48:29 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-08-10 20:48:29 +0000 |
| commit | eb2692571fab1cc9996c0b972aee5e1c48ae0989 (patch) | |
| tree | 862739b146f0c019b81347516a3b305b88d74ec8 /libcxx/include/thread | |
| parent | 3b870f045f571507c541ae386473c665ee110f3f (diff) | |
| download | bcm5719-llvm-eb2692571fab1cc9996c0b972aee5e1c48ae0989.tar.gz bcm5719-llvm-eb2692571fab1cc9996c0b972aee5e1c48ae0989.zip | |
patch by Jesse Towner, and bug fix by Sebastian Redl
llvm-svn: 110724
Diffstat (limited to 'libcxx/include/thread')
| -rw-r--r-- | libcxx/include/thread | 11 |
1 files changed, 6 insertions, 5 deletions
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 |
