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

Unified Diff: base/callback_internal.h

Issue 11961021: base: Convert scoped_arrays to the new scoped_ptr style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « no previous file | base/environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/callback_internal.h
diff --git a/base/callback_internal.h b/base/callback_internal.h
index d9aba39fc37f8411ec018338e2d6bf396fd7c2c2..254ec7c9280b5b2302a3da18822e520b4ec4749f 100644
--- a/base/callback_internal.h
+++ b/base/callback_internal.h
@@ -137,9 +137,9 @@ struct CallbackParamTraits<scoped_ptr<T, D> > {
};
template <typename T>
-struct CallbackParamTraits<scoped_array<T> > {
- typedef scoped_array<T> ForwardType;
- typedef scoped_array<T> StorageType;
+struct CallbackParamTraits<scoped_ptr<T[]> > {
awong 2013/01/16 18:56:06 Does this compile? If we make this change, we rem
tfarina 2013/01/16 19:00:28 I compiled only base_unittests.
+ typedef scoped_ptr<T[]> ForwardType;
+ typedef scoped_ptr<T[]> StorageType;
};
template <typename T, typename R>
@@ -177,7 +177,7 @@ template <typename T, typename D>
scoped_ptr<T, D> CallbackForward(scoped_ptr<T, D>& p) { return p.Pass(); }
template <typename T>
-scoped_array<T> CallbackForward(scoped_array<T>& p) { return p.Pass(); }
+scoped_ptr<T[]> CallbackForward(scoped_ptr<T[]>& p) { return p.Pass(); }
template <typename T, typename R>
scoped_ptr_malloc<T, R> CallbackForward(scoped_ptr_malloc<T, R>& p) {
« no previous file with comments | « no previous file | base/environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698