diff options
| author | James Gregory <james@james.id.au> | 2013-08-19 14:01:32 -0700 |
|---|---|---|
| committer | James Gregory <james@james.id.au> | 2013-08-19 14:01:32 -0700 |
| commit | afcdfff09f8557ce6810546628733f48d6c45408 (patch) | |
| tree | 9c556c29a0556429dc1b421b2d5abade1915a034 /system/include/libcxx/thread | |
| parent | 46c82708d50e839945fa24094fe352241be6a22e (diff) | |
| parent | cd38275faf739ba151c0aa7abe13703c9b8d8235 (diff) | |
Merge remote-tracking branch 'origin/incoming' into touch_handling
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; } |