| Index: webrtc/base/messagehandler.h
|
| diff --git a/webrtc/base/messagehandler.h b/webrtc/base/messagehandler.h
|
| index df82b4ea9afa311caa3872475ac5f819c8388870..b55b229a6db4792dca32ca95c0adaff508c7110d 100644
|
| --- a/webrtc/base/messagehandler.h
|
| +++ b/webrtc/base/messagehandler.h
|
| @@ -11,6 +11,8 @@
|
| #ifndef WEBRTC_BASE_MESSAGEHANDLER_H_
|
| #define WEBRTC_BASE_MESSAGEHANDLER_H_
|
|
|
| +#include <utility>
|
| +
|
| #include "webrtc/base/constructormagic.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
|
|
| @@ -54,8 +56,8 @@ class FunctorMessageHandler<class rtc::scoped_ptr<ReturnT>, FunctorT>
|
| : public MessageHandler {
|
| public:
|
| explicit FunctorMessageHandler(const FunctorT& functor) : functor_(functor) {}
|
| - virtual void OnMessage(Message* msg) { result_ = functor_().Pass(); }
|
| - rtc::scoped_ptr<ReturnT> result() { return result_.Pass(); }
|
| + virtual void OnMessage(Message* msg) { result_ = std::move(functor_()); }
|
| + rtc::scoped_ptr<ReturnT> result() { return std::move(result_); }
|
|
|
| private:
|
| FunctorT functor_;
|
|
|