From 3778a371fdd62960732e22f9ab23fdc8ef6efd4d Mon Sep 17 00:00:00 2001 From: Patryk Wrobel Date: Mon, 15 Aug 2022 22:51:59 +0000 Subject: [PATCH] Count parameter pack's elements via sizeof...(Ts) This change removes redundant template functions, which duplicated the functionality of sizeof...() operator. Signed-off-by: Patryk Wrobel --- .../unit_test/utilities/containers_tests_helpers.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/shared/test/unit_test/utilities/containers_tests_helpers.h b/shared/test/unit_test/utilities/containers_tests_helpers.h index a3d58a68a5..b422cb6803 100644 --- a/shared/test/unit_test/utilities/containers_tests_helpers.h +++ b/shared/test/unit_test/utilities/containers_tests_helpers.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,16 +9,6 @@ #include -template -size_t countArgs(const Arg1 &arg1) { - return 1; -} - -template -size_t countArgs(const Arg1 &arg1, const Rest &...rest) { - return 1 + countArgs(rest...); -} - template int verifySequence(const NodeObjectType *base, int nodeNum, const NodeObjectType *last) { if (base == last) { @@ -58,7 +48,7 @@ int verifyFListOrder(const NodeObjectType *base, const NodeObjectType *first, co if (sequenceRet < 0) { return sequenceRet; } - int totalReferenceNodes = (int)countArgs(first, rest...); + int totalReferenceNodes = static_cast(1 + sizeof...(rest)); if (sequenceRet >= totalReferenceNodes) { // base defines longer sequence than expected return totalReferenceNodes - 1;