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

Unified Diff: cc/base/scoped_ptr_vector.h

Issue 609663003: cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc-passas: PassAs-presubmit-warning Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/base/region.cc ('k') | cc/blink/web_animation_curve_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « cc/base/region.cc ('k') | cc/blink/web_animation_curve_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698