Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LWG-3117 Missing packaged_task deduction guides #1493

Merged
merged 3 commits into from
Dec 3, 2020
Merged

LWG-3117 Missing packaged_task deduction guides #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7412a6f
Added deduction guides
futuarmo Nov 21, 2020
303b1d1
Rename macro to _PACKAGED_TASK_DEDUCTION_GUIDE.
StephanTLavavej Nov 25, 2020
5bacbd7
Update P0433R2_deduction_guides.
StephanTLavavej Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions stl/inc/future
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,6 +1416,18 @@ private:
_MyPromiseType _MyPromise;
};

#if _HAS_CXX17
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
#define _PACKAGED_TASK_DEDUCTION_GUIDE(CALL_OPT, X1, X2, X3) \
template <class _Ret, class... _Types> \
packaged_task(_Ret(CALL_OPT*)(_Types...)) -> packaged_task<_Ret(_Types...)>; // intentionally discards CALL_OPT

_NON_MEMBER_CALL(_PACKAGED_TASK_DEDUCTION_GUIDE, X1, X2, X3)
#undef _PACKAGED_TASK_DEDUCTION_GUIDE

template <class _Fx>
packaged_task(_Fx) -> packaged_task<typename _Deduce_signature<_Fx>::type>;
#endif // _HAS_CXX17

#if _HAS_FUNCTION_ALLOCATOR_SUPPORT
template <class _Ty, class _Alloc>
struct uses_allocator<packaged_task<_Ty>, _Alloc> : true_type {};
Expand Down
54 changes: 33 additions & 21 deletions tests/std/tests/P0433R2_deduction_guides/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#endif // _M_CEE_PURE

#ifndef _M_CEE
#include <future>
#include <mutex>
#include <shared_mutex>
#endif // _M_CEE
Expand Down Expand Up @@ -293,34 +294,40 @@ void test_transparent_operator_functors() {
static_assert(is_same_v<decltype(greater{}), greater<>>);
}

void test_function() {
function<short(int, long)> f1{};
function f2(f1);
template <template <typename> typename F>
void test_function_wrapper() {
F<short(int, long)> f1{};

static_assert(is_same_v<decltype(f2), function<short(int, long)>>);
if constexpr (is_copy_constructible_v<F<short(int, long)>>) {
F f2copy(f1);
static_assert(is_same_v<decltype(f2copy), F<short(int, long)>>);
}

F f2(move(f1));
static_assert(is_same_v<decltype(f2), F<short(int, long)>>);

function f3(nothing);
function f4(&nothing);
function f5(square);
function f6(&square);
function f7(add);
function f8(&add);
F f3(nothing);
F f4(&nothing);
F f5(square);
F f6(&square);
F f7(add);
F f8(&add);

static_assert(is_same_v<decltype(f3), function<void()>>);
static_assert(is_same_v<decltype(f4), function<void()>>);
static_assert(is_same_v<decltype(f5), function<int(int)>>);
static_assert(is_same_v<decltype(f6), function<int(int)>>);
static_assert(is_same_v<decltype(f7), function<long(short, int)>>);
static_assert(is_same_v<decltype(f8), function<long(short, int)>>);
static_assert(is_same_v<decltype(f3), F<void()>>);
static_assert(is_same_v<decltype(f4), F<void()>>);
static_assert(is_same_v<decltype(f5), F<int(int)>>);
static_assert(is_same_v<decltype(f6), F<int(int)>>);
static_assert(is_same_v<decltype(f7), F<long(short, int)>>);
static_assert(is_same_v<decltype(f8), F<long(short, int)>>);

int n = 0;
auto accum = [&n](int x, int y) { return n += x + y; };

function f9(plus<double>{});
function f10(accum);
F f9(plus<double>{});
F f10(accum);

static_assert(is_same_v<decltype(f9), function<double(const double&, const double&)>>);
static_assert(is_same_v<decltype(f10), function<int(int, int)>>);
static_assert(is_same_v<decltype(f9), F<double(const double&, const double&)>>);
static_assert(is_same_v<decltype(f10), F<int(int, int)>>);
}

void test_searchers() {
Expand Down Expand Up @@ -927,7 +934,12 @@ int main() {
test_scoped_allocator_adaptor();
test_reference_wrapper();
test_transparent_operator_functors();
test_function();

test_function_wrapper<function>();
#ifndef _M_CEE
test_function_wrapper<packaged_task>();
#endif // _M_CEE

test_searchers();
test_duration_and_time_point();
test_basic_string();
Expand Down