From d1a4917d295953460e395f6bd470cb15afe7a28e Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 3 Jul 2024 00:20:58 +0200 Subject: [PATCH] TaskTree: Compile fix Fix "Tasking::operator !': redefinition; different linkage" error. Amends 0f5882f13cb16286495c71201c08ebf3576fe8c0 Amends 490410e18d514db47a1c9a5b251e7d336be4583e Change-Id: I5d03b9543c194fc3dc72be89840e70c72f8f2fa6 Reviewed-by: Christian Stenger --- src/libs/solutions/tasking/tasktree.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/libs/solutions/tasking/tasktree.h b/src/libs/solutions/tasking/tasktree.h index 2eb2530007b..b839c771cfe 100644 --- a/src/libs/solutions/tasking/tasktree.h +++ b/src/libs/solutions/tasking/tasktree.h @@ -308,18 +308,16 @@ protected: ExecutableItem(const TaskHandler &handler) : GroupItem(handler) {} private: - friend ExecutableItem operator!(const ExecutableItem &item); - friend ExecutableItem operator&&(const ExecutableItem &first, const ExecutableItem &second); - friend ExecutableItem operator||(const ExecutableItem &first, const ExecutableItem &second); + TASKING_EXPORT friend ExecutableItem operator!(const ExecutableItem &item); + TASKING_EXPORT friend ExecutableItem operator&&(const ExecutableItem &first, + const ExecutableItem &second); + TASKING_EXPORT friend ExecutableItem operator||(const ExecutableItem &first, + const ExecutableItem &second); ExecutableItem withCancelImpl( const std::function &)> &connectWrapper) const; }; -TASKING_EXPORT ExecutableItem operator!(const ExecutableItem &item); -TASKING_EXPORT ExecutableItem operator&&(const ExecutableItem &first, const ExecutableItem &second); -TASKING_EXPORT ExecutableItem operator||(const ExecutableItem &first, const ExecutableItem &second); - class TASKING_EXPORT Group : public ExecutableItem { public: