diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 00:16:25 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 00:16:25 +0000 |
| commit | 89ae3d88032cfc42f5a75024e2a49f7fa3412edb (patch) | |
| tree | 1fbb73790faec976ed0a9be04389332b2eb7b612 /base/callback_internal.h | |
| parent | 1e1799b31d9e7283aaf6f98769444163abc8d4bf (diff) | |
| download | chromium_src-89ae3d88032cfc42f5a75024e2a49f7fa3412edb.zip chromium_src-89ae3d88032cfc42f5a75024e2a49f7fa3412edb.tar.gz chromium_src-89ae3d88032cfc42f5a75024e2a49f7fa3412edb.tar.bz2 | |
Permit .Pass()ing scoped_ptr_malloc<>'s that have custom FreeProcs.
BUG=126008
TEST=TaskRunnerHelpersTest.PostTaskAndReplyWithResultPassed
R=willchan
Review URL: https://chromiumcodereview.appspot.com/10384021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/callback_internal.h')
| -rw-r--r-- | base/callback_internal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/callback_internal.h b/base/callback_internal.h index 92ea80a..56d88a3 100644 --- a/base/callback_internal.h +++ b/base/callback_internal.h @@ -143,10 +143,10 @@ struct CallbackParamTraits<scoped_array<T> > { typedef scoped_array<T> StorageType; }; -template <typename T> -struct CallbackParamTraits<scoped_ptr_malloc<T> > { - typedef scoped_ptr_malloc<T> ForwardType; - typedef scoped_ptr_malloc<T> StorageType; +template <typename T, typename R> +struct CallbackParamTraits<scoped_ptr_malloc<T, R> > { + typedef scoped_ptr_malloc<T, R> ForwardType; + typedef scoped_ptr_malloc<T, R> StorageType; }; template <typename T> @@ -180,8 +180,8 @@ scoped_ptr<T> CallbackForward(scoped_ptr<T>& p) { return p.Pass(); } template <typename T> scoped_array<T> CallbackForward(scoped_array<T>& p) { return p.Pass(); } -template <typename T> -scoped_ptr_malloc<T> CallbackForward(scoped_ptr_malloc<T>& p) { +template <typename T, typename R> +scoped_ptr_malloc<T, R> CallbackForward(scoped_ptr_malloc<T, R>& p) { return p.Pass(); } |