diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-08-15 16:51:29 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-08-15 16:51:29 -0700 |
commit | 41e7af7eeb7f0d0a3991abd7ff87177308570c54 (patch) | |
tree | 3c0684b6549c0e186032ca38252bc40fc4657273 /system/include/libcxx/thread | |
parent | b1eaf55eefb815e8f3556b59ce64e6d1e0f55d55 (diff) | |
parent | 2e229a560955c07d1b66db27913af3284baa64fb (diff) |
Merge branch 'incoming'
Diffstat (limited to 'system/include/libcxx/thread')
-rw-r--r-- | system/include/libcxx/thread | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/include/libcxx/thread b/system/include/libcxx/thread index 8d3aab2a..f41ea290 100644 --- a/system/include/libcxx/thread +++ b/system/include/libcxx/thread @@ -328,7 +328,7 @@ __thread_specific_ptr<__thread_struct>& __thread_local_data(); template <class _Fp, class ..._Args, size_t ..._Indices> inline _LIBCPP_INLINE_VISIBILITY void -__threaad_execute(tuple<_Fp, _Args...>& __t, __tuple_indices<_Indices...>) +__thread_execute(tuple<_Fp, _Args...>& __t, __tuple_indices<_Indices...>) { __invoke(_VSTD::move(_VSTD::get<0>(__t)), _VSTD::move(_VSTD::get<_Indices>(__t))...); } @@ -340,7 +340,7 @@ __thread_proxy(void* __vp) __thread_local_data().reset(new __thread_struct); std::unique_ptr<_Fp> __p(static_cast<_Fp*>(__vp)); typedef typename __make_tuple_indices<tuple_size<_Fp>::value, 1>::type _Index; - __threaad_execute(*__p, _Index()); + __thread_execute(*__p, _Index()); return nullptr; } |