From 5ae013a2b6c76c92ec3008850e4e43732945bca0 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 19 Aug 2022 14:07:34 +0200 Subject: [PATCH] Remove unneeded Q_DECLARE_SHARED_IMPL After d06a686cad63474ddb2dfe4a4118c923c805e290, Q_DECLARE_SHARED_IMPL is used only in Q_DECLARE_TYPEINFO, so remove the indirection through Q_DECLARE_TYPEINFO_IMPL. Change-Id: Ida188053c4ea512e9ebdf04f807f86a6159f8425 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/global/qtclasshelpermacros.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/corelib/global/qtclasshelpermacros.h b/src/corelib/global/qtclasshelpermacros.h index 3c59404910..6e72b0f7c1 100644 --- a/src/corelib/global/qtclasshelpermacros.h +++ b/src/corelib/global/qtclasshelpermacros.h @@ -130,12 +130,11 @@ template inline auto qGetPtrHelper(Ptr &ptr) noexcept -> decltype namespace as Qt for this to work. */ -#define Q_DECLARE_SHARED_IMPL(TYPE, FLAGS) \ -Q_DECLARE_TYPEINFO(TYPE, FLAGS); \ +#define Q_DECLARE_SHARED(TYPE) \ +Q_DECLARE_TYPEINFO(TYPE, Q_RELOCATABLE_TYPE); \ inline void swap(TYPE &value1, TYPE &value2) \ noexcept(noexcept(value1.swap(value2))) \ { value1.swap(value2); } -#define Q_DECLARE_SHARED(TYPE) Q_DECLARE_SHARED_IMPL(TYPE, Q_RELOCATABLE_TYPE) #endif // __cplusplus