Skip to content

Commit 97618ce

Browse files
committed
Cleanup
1 parent a5f3b87 commit 97618ce

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

include/tao/seq/make_integer_sequence.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ namespace tao
6666
struct memoize_sequence
6767
{
6868
static_assert( N < T( 1 << 20 ), "N too large" );
69+
// clang-format off
6970
using type = typename generate_sequence< false, false >::template f< T, ( N < T( 1 << 1 ) ) ? T( 1 << 1 ) : ( N < T( 1 << 2 ) ) ? T( 1 << 2 ) : ( N < T( 1 << 3 ) ) ? T( 1 << 3 ) : ( N < T( 1 << 4 ) ) ? T( 1 << 4 ) : ( N < T( 1 << 5 ) ) ? T( 1 << 5 ) : ( N < T( 1 << 6 ) ) ? T( 1 << 6 ) : ( N < T( 1 << 7 ) ) ? T( 1 << 7 ) : ( N < T( 1 << 8 ) ) ? T( 1 << 8 ) : ( N < T( 1 << 9 ) ) ? T( 1 << 9 ) : ( N < T( 1 << 10 ) ) ? T( 1 << 10 ) : T( 1 << 20 ), N, 0 >;
71+
// clang-format on
7072
};
7173

7274
} // namespace impl

include/tao/tuple/tuple.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ namespace tao
189189

190190
tuple_value( const tuple_value& ) = default;
191191
tuple_value( tuple_value&& ) = default;
192-
tuple_value& operator=( tuple_value const& ) = default;
192+
tuple_value& operator=( const tuple_value& ) = default;
193193
tuple_value& operator=( tuple_value&& ) = default;
194194

195195
template< typename U >
@@ -283,8 +283,8 @@ namespace tao
283283

284284
tuple_value( const tuple_value& ) = default;
285285
tuple_value( tuple_value&& ) = default;
286-
tuple_value& operator=( tuple_value const& ) = default;
287-
tuple_value& operator=( tuple_value && ) = default;
286+
tuple_value& operator=( const tuple_value& ) = default;
287+
tuple_value& operator=( tuple_value&& ) = default;
288288

289289
template< typename U >
290290
TAO_TUPLE_CUDA_ANNOTATE_COMMON tuple_value& operator=( U&& v ) noexcept( std::is_nothrow_assignable< T&, U >::value )
@@ -424,8 +424,8 @@ namespace tao
424424

425425
tuple( const tuple& ) = default;
426426
tuple( tuple&& ) = default;
427-
tuple& operator=( tuple const& ) = default;
428-
tuple& operator=( tuple && ) = default;
427+
tuple& operator=( const tuple& ) = default;
428+
tuple& operator=( tuple&& ) = default;
429429

430430
TAO_TUPLE_SUPPRESS_NVCC_HD_WARN
431431
template< typename... Us,

src/test/tuple/tuple_main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ int main()
2020
static_assert( tuple_size< decltype( t ) >::value == 3, "oops" );
2121
static_assert( tuple_size< decltype( t2 ) >::value == 3, "oops" );
2222
static_assert( tuple_size< decltype( t3 ) >::value == 3, "oops" );
23-
#ifndef _MSC_VER // Known failure on Microsoft compiler
24-
static_assert(std::is_trivially_copyable<tuple<int>>::value, "");
23+
#ifndef _MSC_VER // Known failure on Microsoft compiler
24+
static_assert( std::is_trivially_copyable< tuple< int > >::value, "" );
2525
#endif
26-
static_assert(std::is_trivially_destructible<tuple<int>>::value, "");
26+
static_assert( std::is_trivially_destructible< tuple< int > >::value, "" );
2727

2828
struct composite
2929
{
30-
tuple<int, double, int> inner;
30+
tuple< int, double, int > inner;
3131
};
3232

3333
composite t6;
@@ -36,7 +36,7 @@ int main()
3636
// Just check for the existence of these (if they exist they are compiler
3737
// generated and should work correctly)
3838
t6 = t7;
39-
t6 = std::move(t7);
39+
t6 = std::move( t7 );
4040

4141
assert( get< 0 >( t2 ) == 1 );
4242
assert( get< 1 >( t2 ) == 2 );

0 commit comments

Comments
 (0)