Index: webrtc/base/messagequeue.h |
diff --git a/webrtc/base/messagequeue.h b/webrtc/base/messagequeue.h |
index 3750eb7271943bd230f85ccb532e97e0a8e7d49a..429a56a8c1e3cd69f6dcafa1b19fbc90dfa51f03 100644 |
--- a/webrtc/base/messagequeue.h |
+++ b/webrtc/base/messagequeue.h |
@@ -17,7 +17,6 @@ |
#include <list> |
#include <memory> |
#include <queue> |
-#include <utility> |
#include <vector> |
#include "webrtc/base/basictypes.h" |
@@ -99,10 +98,9 @@ |
template <class T> |
class ScopedMessageData : public MessageData { |
public: |
- explicit ScopedMessageData(std::unique_ptr<T> data) |
- : data_(std::move(data)) {} |
- const T& data() const { return *data_; } |
- T& data() { return *data_; } |
+ explicit ScopedMessageData(T* data) : data_(data) { } |
+ const std::unique_ptr<T>& data() const { return data_; } |
+ std::unique_ptr<T>& data() { return data_; } |
private: |
std::unique_ptr<T> data_; |