Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: base/memory/scoped_vector.h

Issue 1407443002: Remove old C++03 move emulation code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef BASE_MEMORY_SCOPED_VECTOR_H_ 5 #ifndef BASE_MEMORY_SCOPED_VECTOR_H_
6 #define BASE_MEMORY_SCOPED_VECTOR_H_ 6 #define BASE_MEMORY_SCOPED_VECTOR_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/move.h" 13 #include "base/move.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 15
16 // ScopedVector wraps a vector deleting the elements from its 16 // ScopedVector wraps a vector deleting the elements from its
17 // destructor. 17 // destructor.
18 template <class T> 18 template <class T>
19 class ScopedVector { 19 class ScopedVector {
20 MOVE_ONLY_TYPE_FOR_CPP_03(ScopedVector, RValue) 20 MOVE_ONLY_TYPE_FOR_CPP_03(ScopedVector)
21 21
22 public: 22 public:
23 typedef typename std::vector<T*>::allocator_type allocator_type; 23 typedef typename std::vector<T*>::allocator_type allocator_type;
24 typedef typename std::vector<T*>::size_type size_type; 24 typedef typename std::vector<T*>::size_type size_type;
25 typedef typename std::vector<T*>::difference_type difference_type; 25 typedef typename std::vector<T*>::difference_type difference_type;
26 typedef typename std::vector<T*>::pointer pointer; 26 typedef typename std::vector<T*>::pointer pointer;
27 typedef typename std::vector<T*>::const_pointer const_pointer; 27 typedef typename std::vector<T*>::const_pointer const_pointer;
28 typedef typename std::vector<T*>::reference reference; 28 typedef typename std::vector<T*>::reference reference;
29 typedef typename std::vector<T*>::const_reference const_reference; 29 typedef typename std::vector<T*>::const_reference const_reference;
30 typedef typename std::vector<T*>::value_type value_type; 30 typedef typename std::vector<T*>::value_type value_type;
31 typedef typename std::vector<T*>::iterator iterator; 31 typedef typename std::vector<T*>::iterator iterator;
32 typedef typename std::vector<T*>::const_iterator const_iterator; 32 typedef typename std::vector<T*>::const_iterator const_iterator;
33 typedef typename std::vector<T*>::reverse_iterator reverse_iterator; 33 typedef typename std::vector<T*>::reverse_iterator reverse_iterator;
34 typedef typename std::vector<T*>::const_reverse_iterator 34 typedef typename std::vector<T*>::const_reverse_iterator
35 const_reverse_iterator; 35 const_reverse_iterator;
36 36
37 ScopedVector() {} 37 ScopedVector() {}
38 ~ScopedVector() { clear(); } 38 ~ScopedVector() { clear(); }
39 ScopedVector(RValue other) { swap(*other.object); } 39 ScopedVector(ScopedVector&& other) { swap(other); }
40 40
41 ScopedVector& operator=(RValue rhs) { 41 ScopedVector& operator=(ScopedVector&& rhs) {
42 swap(*rhs.object); 42 swap(rhs);
43 return *this; 43 return *this;
44 } 44 }
45 45
46 reference operator[](size_t index) { return v_[index]; } 46 reference operator[](size_t index) { return v_[index]; }
47 const_reference operator[](size_t index) const { return v_[index]; } 47 const_reference operator[](size_t index) const { return v_[index]; }
48 48
49 bool empty() const { return v_.empty(); } 49 bool empty() const { return v_.empty(); }
50 size_t size() const { return v_.size(); } 50 size_t size() const { return v_.size(); }
51 51
52 reverse_iterator rbegin() { return v_.rbegin(); } 52 reverse_iterator rbegin() { return v_.rbegin(); }
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 // Like |erase()|, but doesn't delete the elements in [first, last). 134 // Like |erase()|, but doesn't delete the elements in [first, last).
135 iterator weak_erase(iterator first, iterator last) { 135 iterator weak_erase(iterator first, iterator last) {
136 return v_.erase(first, last); 136 return v_.erase(first, last);
137 } 137 }
138 138
139 private: 139 private:
140 std::vector<T*> v_; 140 std::vector<T*> v_;
141 }; 141 };
142 142
143 #endif // BASE_MEMORY_SCOPED_VECTOR_H_ 143 #endif // BASE_MEMORY_SCOPED_VECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698