Index: webrtc/base/scoped_ptr.h |
diff --git a/webrtc/base/scoped_ptr.h b/webrtc/base/scoped_ptr.h |
index b7e94989e57aa6f402282db72badfc578c74b5bc..1ad359e705e72989e43e3e975bcb2713640cf6a9 100644 |
--- a/webrtc/base/scoped_ptr.h |
+++ b/webrtc/base/scoped_ptr.h |
@@ -595,11 +595,11 @@ void swap(rtc::scoped_ptr<T, D>& p1, rtc::scoped_ptr<T, D>& p2) { |
// Convert between the most common kinds of scoped_ptr and unique_ptr. |
template <typename T> |
-std::unique_ptr<T> ScopedToUnique(scoped_ptr<T> sp) { |
+std::unique_ptr<T> ScopedToUnique(scoped_ptr<T>&& sp) { |
Sergey Ulanov
2016/03/31 18:41:15
Is this change related to this CL?
I don't see the
Hzj_jie
2016/04/05 23:15:17
No, not related, my bad to copy this change from C
|
return std::unique_ptr<T>(sp.release()); |
} |
template <typename T> |
-scoped_ptr<T> UniqueToScoped(std::unique_ptr<T> up) { |
+scoped_ptr<T> UniqueToScoped(std::unique_ptr<T>&& up) { |
return scoped_ptr<T>(up.release()); |
} |