zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to return moved value from FunctorMessageHandler, Optional.

Browse Source 
This functionality is desired for this CL:
https://codereview.webrtc.org/2675173003/

BUG=None

Review-Url: https://codereview.webrtc.org/2681283002
Cr-Commit-Position: refs/heads/master@{#16546}
This commit is contained in:
deadbeef
2017-02-10 18:11:11 -08:00
committed by Commit bot
parent a4549d6588
commit 81baed36bf
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/base/messagehandler.h
View File

@ -45,25 +45,15 @@ class FunctorMessageHandler : public MessageHandler {
}
const ReturnT& result() const { return result_; }
// Returns moved result. Should not call result() or MoveResult() again
// after this.
ReturnT MoveResult() { return std::move(result_); }
private:
FunctorT functor_;
ReturnT result_;
};
// Specialization for std::unique_ptr<ReturnT>.
template <class ReturnT, class FunctorT>
class FunctorMessageHandler<class std::unique_ptr<ReturnT>, FunctorT>
: public MessageHandler {
public:
explicit FunctorMessageHandler(const FunctorT& functor) : functor_(functor) {}
virtual void OnMessage(Message* msg) { result_ = std::move(functor_()); }
std::unique_ptr<ReturnT> result() { return std::move(result_); }
private:
FunctorT functor_;
std::unique_ptr<ReturnT> result_;
};
// Specialization for ReturnT of void.
template <class FunctorT>
class FunctorMessageHandler<void, FunctorT> : public MessageHandler {
@ -74,6 +64,7 @@ class FunctorMessageHandler<void, FunctorT> : public MessageHandler {
functor_();
}
void result() const {}
void MoveResult() {}
private:
FunctorT functor_;