| Index: base/callback_internal.h
|
| diff --git a/base/callback_internal.h b/base/callback_internal.h
|
| index d9aba39fc37f8411ec018338e2d6bf396fd7c2c2..5993824a5a2a28d1d7ccb643ed60fdf24d54c8be 100644
|
| --- a/base/callback_internal.h
|
| +++ b/base/callback_internal.h
|
| @@ -136,12 +136,6 @@ struct CallbackParamTraits<scoped_ptr<T, D> > {
|
| typedef scoped_ptr<T, D> StorageType;
|
| };
|
|
|
| -template <typename T>
|
| -struct CallbackParamTraits<scoped_array<T> > {
|
| - typedef scoped_array<T> ForwardType;
|
| - typedef scoped_array<T> StorageType;
|
| -};
|
| -
|
| template <typename T, typename R>
|
| struct CallbackParamTraits<scoped_ptr_malloc<T, R> > {
|
| typedef scoped_ptr_malloc<T, R> ForwardType;
|
| @@ -176,9 +170,6 @@ T& CallbackForward(T& t) { return t; }
|
| 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(); }
|
| -
|
| template <typename T, typename R>
|
| scoped_ptr_malloc<T, R> CallbackForward(scoped_ptr_malloc<T, R>& p) {
|
| return p.Pass();
|
|
|