diff --git a/include/libcamera/base/bound_method.h b/include/libcamera/base/bound_method.h index 507c320d..e14614bc 100644 --- a/include/libcamera/base/bound_method.h +++ b/include/libcamera/base/bound_method.h @@ -38,11 +38,6 @@ public: { } - R returnValue() - { - return ret_; - } - std::tuple...> args_; R ret_; }; @@ -56,10 +51,6 @@ public: { } - void returnValue() - { - } - std::tuple...> args_; }; @@ -140,8 +131,10 @@ public: return func_(args...); auto pack = std::make_shared(args...); - bool sync = BoundMethodBase::activatePack(pack, deleteMethod); - return sync ? pack->returnValue() : R(); + [[maybe_unused]] bool sync = BoundMethodBase::activatePack(pack, deleteMethod); + + if constexpr (!std::is_void_v) + return sync ? std::move(pack->ret_) : R(); } R invoke(Args... args) override @@ -175,8 +168,10 @@ public: } auto pack = std::make_shared(args...); - bool sync = BoundMethodBase::activatePack(pack, deleteMethod); - return sync ? pack->returnValue() : R(); + [[maybe_unused]] bool sync = BoundMethodBase::activatePack(pack, deleteMethod); + + if constexpr (!std::is_void_v) + return sync ? std::move(pack->ret_) : R(); } R invoke(Args... args) override diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp index def1e61e..ab4a1575 100644 --- a/test/object-invoke.cpp +++ b/test/object-invoke.cpp @@ -58,6 +58,19 @@ public: return 42; } + struct MoveOnly { + MoveOnly() = default; + MoveOnly(const MoveOnly &) = delete; + MoveOnly &operator=(const MoveOnly &) = delete; + MoveOnly(MoveOnly &&) = default; + MoveOnly &operator=(MoveOnly &&) = default; + }; + + MoveOnly methodWithReturnMoveOnly() + { + return {}; + } + private: Status status_; int value_; @@ -186,6 +199,10 @@ protected: return TestFail; } + /* Test invoking a method that returns type with no copy ctor/assignment. */ + object_.invokeMethod(&InvokedObject::methodWithReturnMoveOnly, + ConnectionTypeBlocking); + return TestPass; }