| Index: cc/base/scoped_ptr_vector.h
|
| diff --git a/cc/base/scoped_ptr_vector.h b/cc/base/scoped_ptr_vector.h
|
| index 7f86ce3ebd943e3b6387b9108fc848c457d4ae55..0b83e35f329c863a28dd117f4db9e9d53eaa0a66 100644
|
| --- a/cc/base/scoped_ptr_vector.h
|
| +++ b/cc/base/scoped_ptr_vector.h
|
| @@ -72,7 +72,7 @@ class ScopedPtrVector {
|
|
|
| scoped_ptr<T> take(iterator position) {
|
| if (position == end())
|
| - return scoped_ptr<T>();
|
| + return nullptr;
|
| DCHECK(position < end());
|
|
|
| typename std::vector<T*>::iterator writable_position = position;
|
| @@ -84,7 +84,7 @@ class ScopedPtrVector {
|
| scoped_ptr<T> take_back() {
|
| DCHECK(!empty());
|
| if (empty())
|
| - return scoped_ptr<T>(NULL);
|
| + return nullptr;
|
| return take(end() - 1);
|
| }
|
|
|
|
|