| Index: cc/base/scoped_ptr_hash_map.h
|
| diff --git a/cc/base/scoped_ptr_hash_map.h b/cc/base/scoped_ptr_hash_map.h
|
| index 49421c3ca12b1ad501c83a23c2f8195c251ae0da..47135822d2da78eb55e545e194d225631307d2b0 100644
|
| --- a/cc/base/scoped_ptr_hash_map.h
|
| +++ b/cc/base/scoped_ptr_hash_map.h
|
| @@ -73,7 +73,7 @@ class ScopedPtrHashMap {
|
| scoped_ptr<Value> take(iterator it) {
|
| DCHECK(it != data_.end());
|
| if (it == data_.end())
|
| - return scoped_ptr<Value>(NULL);
|
| + return scoped_ptr<Value>();
|
|
|
| Key key = it->first;
|
| scoped_ptr<Value> ret(it->second);
|
| @@ -85,7 +85,7 @@ class ScopedPtrHashMap {
|
| scoped_ptr<Value> take(const Key& k) {
|
| iterator it = find(k);
|
| if (it == data_.end())
|
| - return scoped_ptr<Value>(NULL);
|
| + return scoped_ptr<Value>();
|
|
|
| return take(it);
|
| }
|
| @@ -93,7 +93,7 @@ class ScopedPtrHashMap {
|
| scoped_ptr<Value> take_and_erase(iterator it) {
|
| DCHECK(it != data_.end());
|
| if (it == data_.end())
|
| - return scoped_ptr<Value>(NULL);
|
| + return scoped_ptr<Value>();
|
|
|
| scoped_ptr<Value> ret(it->second);
|
| data_.erase(it);
|
| @@ -103,7 +103,7 @@ class ScopedPtrHashMap {
|
| scoped_ptr<Value> take_and_erase(const Key& k) {
|
| iterator it = find(k);
|
| if (it == data_.end())
|
| - return scoped_ptr<Value>(NULL);
|
| + return scoped_ptr<Value>();
|
|
|
| return take_and_erase(it);
|
| }
|
|
|