From c773473d756fdad9e429a622295fbaee6eda964b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 1 Mar 2023 14:00:23 +0100 Subject: [PATCH] qobjectdefs.h: optimize AreOldStyleArgs Use a template alias instead of C++98-style inheritance. Saves one template instantiation. Change-Id: I95ee9cf1e5eac1db5fc8e05cd95f5e745134214d Reviewed-by: Fabian Kosmale (cherry picked from commit b37b820ce8801613139241036d15baa581a6a403) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qobjectdefs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 4232d5b1e61..e136fb61f62 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -145,9 +145,9 @@ struct QMetaMethodReturnArgument namespace QtPrivate { namespace Invoke { #if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) -template struct AreOldStyleArgs : - std::disjunction...> -{}; +template +using AreOldStyleArgs = std::disjunction...>; + template using IfNotOldStyleArgs = std::enable_if_t::value, T>; #else