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

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

Issue 10796028: base: Class member variables should be ended with trailing underscores. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no moves Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 23 matching lines...) Expand all
34 34
35 ScopedVector() {} 35 ScopedVector() {}
36 ~ScopedVector() { clear(); } 36 ~ScopedVector() { clear(); }
37 ScopedVector(RValue& other) { swap(other); } 37 ScopedVector(RValue& other) { swap(other); }
38 38
39 ScopedVector& operator=(RValue& rhs) { 39 ScopedVector& operator=(RValue& rhs) {
40 swap(rhs); 40 swap(rhs);
41 return *this; 41 return *this;
42 } 42 }
43 43
44 T*& operator[](size_t i) { return v[i]; } 44 T*& operator[](size_t index) { return v_[index]; }
45 const T* operator[](size_t i) const { return v[i]; } 45 const T* operator[](size_t index) const { return v_[index]; }
46 46
47 bool empty() const { return v.empty(); } 47 bool empty() const { return v_.empty(); }
48 size_t size() const { return v.size(); } 48 size_t size() const { return v_.size(); }
49 49
50 reverse_iterator rbegin() { return v.rbegin(); } 50 reverse_iterator rbegin() { return v_.rbegin(); }
51 const_reverse_iterator rbegin() const { return v.rbegin(); } 51 const_reverse_iterator rbegin() const { return v_.rbegin(); }
52 reverse_iterator rend() { return v.rend(); } 52 reverse_iterator rend() { return v_.rend(); }
53 const_reverse_iterator rend() const { return v.rend(); } 53 const_reverse_iterator rend() const { return v_.rend(); }
54 54
55 iterator begin() { return v.begin(); } 55 iterator begin() { return v_.begin(); }
56 const_iterator begin() const { return v.begin(); } 56 const_iterator begin() const { return v_.begin(); }
57 iterator end() { return v.end(); } 57 iterator end() { return v_.end(); }
58 const_iterator end() const { return v.end(); } 58 const_iterator end() const { return v_.end(); }
59 59
60 const_reference front() const { return v.front(); } 60 const_reference front() const { return v_.front(); }
61 reference front() { return v.front(); } 61 reference front() { return v_.front(); }
62 const_reference back() const { return v.back(); } 62 const_reference back() const { return v_.back(); }
63 reference back() { return v.back(); } 63 reference back() { return v_.back(); }
64 64
65 void push_back(T* elem) { v.push_back(elem); } 65 void push_back(T* elem) { v_.push_back(elem); }
66 66
67 std::vector<T*>& get() { return v; } 67 std::vector<T*>& get() { return v_; }
68 const std::vector<T*>& get() const { return v; } 68 const std::vector<T*>& get() const { return v_; }
69 void swap(std::vector<T*>& other) { v.swap(other); } 69 void swap(std::vector<T*>& other) { v_.swap(other); }
70 void swap(ScopedVector<T>& other) { v.swap(other.v); } 70 void swap(ScopedVector<T>& other) { v_.swap(other.v_); }
71 void release(std::vector<T*>* out) { 71 void release(std::vector<T*>* out) {
72 out->swap(v); 72 out->swap(v_);
73 v.clear(); 73 v_.clear();
74 } 74 }
75 75
76 void reserve(size_t capacity) { v.reserve(capacity); } 76 void reserve(size_t capacity) { v_.reserve(capacity); }
77 void resize(size_t new_size) { v.resize(new_size); } 77 void resize(size_t new_size) { v_.resize(new_size); }
78 78
79 template<typename InputIterator> 79 template<typename InputIterator>
80 void assign(InputIterator begin, InputIterator end) { 80 void assign(InputIterator begin, InputIterator end) {
81 v.assign(begin, end); 81 v_.assign(begin, end);
82 } 82 }
83 83
84 void clear() { STLDeleteElements(&v); } 84 void clear() { STLDeleteElements(&v_); }
85 85
86 // Like |clear()|, but doesn't delete any elements. 86 // Like |clear()|, but doesn't delete any elements.
87 void weak_clear() { v.clear(); } 87 void weak_clear() { v_.clear(); }
88 88
89 // Lets the ScopedVector take ownership of |x|. 89 // Lets the ScopedVector take ownership of |x|.
90 iterator insert(iterator position, T* x) { 90 iterator insert(iterator position, T* x) {
91 return v.insert(position, x); 91 return v_.insert(position, x);
92 } 92 }
93 93
94 // Lets the ScopedVector take ownership of elements in [first,last). 94 // Lets the ScopedVector take ownership of elements in [first,last).
95 template<typename InputIterator> 95 template<typename InputIterator>
96 void insert(iterator position, InputIterator first, InputIterator last) { 96 void insert(iterator position, InputIterator first, InputIterator last) {
97 v.insert(position, first, last); 97 v_.insert(position, first, last);
98 } 98 }
99 99
100 iterator erase(iterator position) { 100 iterator erase(iterator position) {
101 delete *position; 101 delete *position;
102 return v.erase(position); 102 return v_.erase(position);
103 } 103 }
104 104
105 iterator erase(iterator first, iterator last) { 105 iterator erase(iterator first, iterator last) {
106 STLDeleteContainerPointers(first, last); 106 STLDeleteContainerPointers(first, last);
107 return v.erase(first, last); 107 return v_.erase(first, last);
108 } 108 }
109 109
110 // Like |erase()|, but doesn't delete the element at |position|. 110 // Like |erase()|, but doesn't delete the element at |position|.
111 iterator weak_erase(iterator position) { 111 iterator weak_erase(iterator position) {
112 return v.erase(position); 112 return v_.erase(position);
113 } 113 }
114 114
115 // Like |erase()|, but doesn't delete the elements in [first, last). 115 // Like |erase()|, but doesn't delete the elements in [first, last).
116 iterator weak_erase(iterator first, iterator last) { 116 iterator weak_erase(iterator first, iterator last) {
117 return v.erase(first, last); 117 return v_.erase(first, last);
118 } 118 }
119 119
120 private: 120 private:
121 std::vector<T*> v; 121 std::vector<T*> v_;
122 }; 122 };
123 123
124 #endif // BASE_MEMORY_SCOPED_VECTOR_H_ 124 #endif // BASE_MEMORY_SCOPED_VECTOR_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698