Index: base/memory/scoped_vector.h |
diff --git a/base/memory/scoped_vector.h b/base/memory/scoped_vector.h |
index e1e5c722a4fbe2e6d9f6b902640246b3209cb41c..088df0683056a6973c82db914b2cf5a87136cce6 100644 |
--- a/base/memory/scoped_vector.h |
+++ b/base/memory/scoped_vector.h |
@@ -17,7 +17,7 @@ |
// destructor. |
template <class T> |
class ScopedVector { |
- MOVE_ONLY_TYPE_FOR_CPP_03(ScopedVector, RValue) |
+ MOVE_ONLY_TYPE_FOR_CPP_03(ScopedVector) |
public: |
typedef typename std::vector<T*>::allocator_type allocator_type; |
@@ -36,10 +36,10 @@ class ScopedVector { |
ScopedVector() {} |
~ScopedVector() { clear(); } |
- ScopedVector(RValue other) { swap(*other.object); } |
+ ScopedVector(ScopedVector&& other) { swap(other); } |
- ScopedVector& operator=(RValue rhs) { |
- swap(*rhs.object); |
+ ScopedVector& operator=(ScopedVector&& rhs) { |
+ swap(rhs); |
return *this; |
} |