Commit b0a4d545 authored by Allison Vacanti's avatar Allison Vacanti Committed by Kitware Robot
Browse files

Merge topic 'CUDA_tuple_warnings'

abdf24a8 Merge branch 'upstream-taotuple' into CUDA_tuple_warnings
2d7ae33d taotuple 2018-06-05 (ae493658)
04d97866 Suppress NVCC warning 2885.
7c1d2736

 taotuple 2018-06-01 (81c6f933)
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1250
parents 9d16fadf abdf24a8
......@@ -33,6 +33,20 @@
#endif // __CUDACC__
#endif // TAOCPP_ANNOTATION
// Ignore "calling a __host__ function from a __host__ _device__ function is not
// allowed" warnings
#ifndef TAOCPP_SUPPRESS_NVCC_HD_WARN
#ifdef __CUDACC__
#if __CUDAVER__ >= 75000
#define TAOCPP_SUPPRESS_NVCC_HD_WARN #pragma nv_exec_check_disable
#else
#define TAOCPP_SUPPRESS_NVCC_HD_WARN #pragma hd_warning_disable
#endif
#else
#define TAOCPP_SUPPRESS_NVCC_HD_WARN
#endif //__CUDACC__
#endif // TAOCPP_SUPPRESS_NVCC_HD_WARN
namespace tao
{
template< typename... Ts >
......@@ -167,9 +181,7 @@ namespace tao
// TODO: Add check for rvalue to lvalue reference
}
TAOCPP_ANNOTATION
tuple_value( const tuple_value& ) = default;
TAOCPP_ANNOTATION
tuple_value( tuple_value&& ) = default;
template< typename U >
......@@ -261,9 +273,7 @@ namespace tao
: T( std::forward< U >( v ), a )
{}
TAOCPP_ANNOTATION
tuple_value( const tuple_value& ) = default;
TAOCPP_ANNOTATION
tuple_value( tuple_value&& ) = default;
template< typename U >
......@@ -305,7 +315,6 @@ namespace tao
struct tuple_base< seq::index_sequence< Is... >, Ts... >
: tuple_value< Is, Ts >...
{
TAOCPP_ANNOTATION
constexpr tuple_base() = default;
template< typename... Us >
......@@ -322,9 +331,7 @@ namespace tao
: tuple_value< Is, Ts >( uses_alloc_ctor_t< Ts, A, Us >(), a, std::forward< Us >( us ) )...
{}
TAOCPP_ANNOTATION
tuple_base( const tuple_base& ) = default;
TAOCPP_ANNOTATION
tuple_base( tuple_base&& ) = default;
TAOCPP_ANNOTATION
......@@ -416,6 +423,7 @@ namespace tao
// 20.4.2.1 Construction [tuple.cnstr]
// TODO: Move this templated condition to base?
TAOCPP_SUPPRESS_NVCC_HD_WARN
template< typename dummy = void,
typename = impl::enable_if_t< seq::is_all< impl::dependent_type< std::is_default_constructible< Ts >, dummy >::value... >::value > >
TAOCPP_ANNOTATION
......@@ -443,9 +451,7 @@ namespace tao
: base( std::forward< Us >( us )... )
{}
TAOCPP_ANNOTATION
tuple( const tuple& ) = default;
TAOCPP_ANNOTATION
tuple( tuple&& ) = default;
template< typename... Us,
......
......@@ -370,6 +370,7 @@ inline void deduce(Trampoline&& trampoline, ContParams&& sig, Args&&... args)
#pragma diag_suppress 2828
#pragma diag_suppress 2864
#pragma diag_suppress 2867
#pragma diag_suppress 2885
#endif
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment