Skip to content

Commit 141911c

Browse files
author
Julian LALU
committed
Improve tuple
1 parent f700e26 commit 141911c

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

interface/core/containers/tuple.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ namespace hud
334334
template<typename... types_t, typename... u_types_t>
335335
constexpr void operator()([[maybe_unused]] hud::tuple<types_t...> &to, [[maybe_unused]] const hud::tuple<u_types_t...> &from) noexcept
336336
{
337-
static_assert(hud::is_same_size_v<hud::tuple<types_t...>, hud::tuple<u_types_t...>>, "Assigning tuples of different size is not supported");
337+
static_assert(hud::tuple_size_v<hud::tuple<types_t...>> == hud::tuple_size_v<hud::tuple<u_types_t...>>, "Assigning tuples of different size is not supported");
338338
if constexpr (count > 0u)
339339
{
340340
constexpr const usize idx = tuple_size_v<hud::tuple<types_t...>> - count;
@@ -353,7 +353,7 @@ namespace hud
353353
template<typename... types_t, typename... u_types_t>
354354
constexpr void operator()([[maybe_unused]] hud::tuple<types_t...> &to, [[maybe_unused]] hud::tuple<u_types_t...> &&from) noexcept
355355
{
356-
static_assert(hud::is_same_size_v<hud::tuple<types_t...>, hud::tuple<u_types_t...>>, "Assigning tuples of different size is not supported");
356+
static_assert(hud::tuple_size_v<hud::tuple<types_t...>> == hud::tuple_size_v<hud::tuple<u_types_t...>>, "Assigning tuples of different size is not supported");
357357
if constexpr (count > 0)
358358
{
359359
constexpr const usize idx = tuple_size_v<hud::tuple<types_t...>> - count;
@@ -388,7 +388,6 @@ namespace hud
388388
template<usize count>
389389
struct tuple_swap
390390
{
391-
392391
/**
393392
* Swap a 2 tuple elements.
394393
* @tparam types_t... List of types_t of the tuple first
@@ -399,7 +398,7 @@ namespace hud
399398
template<typename... types_t, typename... u_types_t>
400399
constexpr void operator()([[maybe_unused]] hud::tuple<types_t...> &first, [[maybe_unused]] hud::tuple<u_types_t...> &second) noexcept
401400
{
402-
static_assert(hud::is_same_size_v<hud::tuple<types_t...>, hud::tuple<u_types_t...>>, "Swapping tuples of different size is not supported");
401+
static_assert(hud::tuple_size_v<hud::tuple<types_t...>> == hud::tuple_size_v<hud::tuple<u_types_t...>>, "Swapping tuples of different size is not supported");
403402

404403
if constexpr (count > 0u)
405404
{
@@ -427,7 +426,7 @@ namespace hud
427426
template<typename... types_t, typename... u_types_t>
428427
[[nodiscard]] constexpr bool operator()([[maybe_unused]] const hud::tuple<types_t...> &first, [[maybe_unused]] const hud::tuple<u_types_t...> &second) noexcept
429428
{
430-
static_assert(hud::is_same_size_v<hud::tuple<types_t...>, hud::tuple<u_types_t...>>, "Comparing tuples of different size is not supported");
429+
static_assert(hud::tuple_size_v<hud::tuple<types_t...>> == hud::tuple_size_v<hud::tuple<u_types_t...>>, "Comparing tuples of different size is not supported");
431430
if constexpr (count > 0u)
432431
{
433432
constexpr const usize index_to_swap = tuple_size_v<hud::tuple<types_t...>> - count;
@@ -457,7 +456,7 @@ namespace hud
457456
template<typename... types_t, typename... u_types_t>
458457
[[nodiscard]] constexpr bool operator()([[maybe_unused]] const hud::tuple<types_t...> &first, [[maybe_unused]] const hud::tuple<u_types_t...> &second) noexcept
459458
{
460-
static_assert(hud::is_same_size_v<hud::tuple<types_t...>, hud::tuple<u_types_t...>>, "Comparing tuples of different size is not supported");
459+
static_assert(hud::tuple_size_v<hud::tuple<types_t...>> == hud::tuple_size_v<hud::tuple<u_types_t...>>, "Comparing tuples of different size is not supported");
461460
if constexpr (count > 0u)
462461
{
463462
constexpr const usize index_to_swap = hud::tuple_size_v<hud::tuple<types_t...>> - count;

0 commit comments

Comments
 (0)