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) { |