Skip to content

Commit 95354d1

Browse files
committed
- Workaround an issue with type aliasesd with template template arguments
containing a parameter pack. - Force C++11 builds by default.
1 parent 20e1c43 commit 95354d1

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# Makefile for building Thrust unit test driver
3232

3333
# Force C++11 mode. NVCC will ignore it if the host compiler doesn't support it.
34-
#export CXX_STD = c++11
34+
export CXX_STD = c++11
3535

3636
export VERBOSE = 1
3737

thrust/detail/dependencies_aware_execution_policy.h

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,52 +34,64 @@ template<template<typename> class ExecutionPolicyCRTPBase>
3434
struct dependencies_aware_execution_policy
3535
{
3636
template<typename ...Dependencies>
37-
using execute_with_dependencies_type = thrust::detail::execute_with_dependencies<
37+
__host__
38+
thrust::detail::execute_with_dependencies<
3839
ExecutionPolicyCRTPBase,
3940
Dependencies...
40-
>;
41-
42-
template<typename ...Dependencies>
43-
__host__
44-
execute_with_dependencies_type<Dependencies...>
41+
>
4542
after(Dependencies&& ...dependencies) const
4643
{
4744
return { capture_as_dependency(THRUST_FWD(dependencies))... };
4845
}
4946

5047
template<typename ...Dependencies>
5148
__host__
52-
execute_with_dependencies_type<Dependencies...>
49+
thrust::detail::execute_with_dependencies<
50+
ExecutionPolicyCRTPBase,
51+
Dependencies...
52+
>
5353
after(std::tuple<Dependencies...>& dependencies) const
5454
{
5555
return { capture_as_dependency(dependencies) };
5656
}
5757
template<typename ...Dependencies>
5858
__host__
59-
execute_with_dependencies_type<Dependencies...>
59+
thrust::detail::execute_with_dependencies<
60+
ExecutionPolicyCRTPBase,
61+
Dependencies...
62+
>
6063
after(std::tuple<Dependencies...>&& dependencies) const
6164
{
6265
return { capture_as_dependency(std::move(dependencies)) };
6366
}
6467

6568
template<typename ...Dependencies>
6669
__host__
67-
execute_with_dependencies_type<Dependencies...>
70+
thrust::detail::execute_with_dependencies<
71+
ExecutionPolicyCRTPBase,
72+
Dependencies...
73+
>
6874
rebind_after(Dependencies&& ...dependencies) const
6975
{
7076
return { capture_as_dependency(THRUST_FWD(dependencies))... };
7177
}
7278

7379
template<typename ...Dependencies>
7480
__host__
75-
execute_with_dependencies_type<Dependencies...>
81+
thrust::detail::execute_with_dependencies<
82+
ExecutionPolicyCRTPBase,
83+
Dependencies...
84+
>
7685
rebind_after(std::tuple<Dependencies...>& dependencies) const
7786
{
7887
return { capture_as_dependency(dependencies) };
7988
}
8089
template<typename ...Dependencies>
8190
__host__
82-
execute_with_dependencies_type<Dependencies...>
91+
thrust::detail::execute_with_dependencies<
92+
ExecutionPolicyCRTPBase,
93+
Dependencies...
94+
>
8395
rebind_after(std::tuple<Dependencies...>&& dependencies) const
8496
{
8597
return { capture_as_dependency(std::move(dependencies)) };

0 commit comments

Comments
 (0)