generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 61549749-> 61608469

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5555 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-02-14 23:38:45 +00:00
parent e2fc13e42f
commit b8c254abd6
7 changed files with 213 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
talk/base/messagehandler.h
View File

@@ -28,7 +28,6 @@
#ifndef TALK_BASE_MESSAGEHANDLER_H_
#define TALK_BASE_MESSAGEHANDLER_H_
#include "talk/base/callback.h"
#include "talk/base/constructormagic.h"
namespace talk_base {
@@ -57,14 +56,12 @@ class FunctorMessageHandler : public MessageHandler {
: functor_(functor) {}
virtual void OnMessage(Message* msg) {
result_ = functor_();
if (!callback_.empty()) callback_();
}
const ReturnT& result() const { return result_; }
void SetCallback(const Callback0<void>& callback) { callback_ = callback; }
private:
FunctorT functor_;
ReturnT result_;
Callback0<void> callback_;
};
// Specialization for ReturnT of void.
@@ -75,13 +72,11 @@ class FunctorMessageHandler<void, FunctorT> : public MessageHandler {
: functor_(functor) {}
virtual void OnMessage(Message* msg) {
functor_();
if (!callback_.empty()) callback_();
}
void result() const {}
void SetCallback(const Callback0<void>& callback) { callback_ = callback; }
private:
FunctorT functor_;
Callback0<void> callback_;
};