| Index: base/memory/scoped_vector.h
|
| diff --git a/base/memory/scoped_vector.h b/base/memory/scoped_vector.h
|
| index 6730612abc6a1bbb9255debbbda67dceccae2dc3..adbab8cf490b4660feb1a025679f5127867e9330 100644
|
| --- a/base/memory/scoped_vector.h
|
| +++ b/base/memory/scoped_vector.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/move.h"
|
| #include "base/stl_util.h"
|
|
|
| @@ -69,7 +69,7 @@ class ScopedVector {
|
| reference back() { return v_.back(); }
|
|
|
| void push_back(T* elem) { v_.push_back(elem); }
|
| - void push_back(scoped_ptr<T> elem) { v_.push_back(elem.release()); }
|
| + void push_back(std::unique_ptr<T> elem) { v_.push_back(elem.release()); }
|
|
|
| void pop_back() {
|
| DCHECK(!empty());
|
| @@ -110,7 +110,7 @@ class ScopedVector {
|
| return v_.insert(position, x);
|
| }
|
|
|
| - iterator insert(iterator position, scoped_ptr<T> x) {
|
| + iterator insert(iterator position, std::unique_ptr<T> x) {
|
| return v_.insert(position, x.release());
|
| }
|
|
|
|
|