| Index: base/callback.h
|
| diff --git a/base/callback.h b/base/callback.h
|
| index bcc3dfdd4f7dc51bac9f77cac5942c950fd6a819..2e17ae9bf549e1257bc1866b8b6248bb6dba45de 100644
|
| --- a/base/callback.h
|
| +++ b/base/callback.h
|
| @@ -3,6 +3,7 @@
|
| // DO NOT EDIT BY HAND!!!
|
|
|
|
|
| +
|
| // Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| @@ -225,7 +226,8 @@ class Callback;
|
| template <typename R>
|
| class Callback<R(void)> : public internal::CallbackBase {
|
| public:
|
| - typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*);
|
| + typedef R(*PolymorphicInvoke)(
|
| + internal::InvokerStorageBase*);
|
|
|
| Callback() : CallbackBase(NULL, NULL) { }
|
|
|
| @@ -254,7 +256,9 @@ class Callback<R(void)> : public internal::CallbackBase {
|
| template <typename R, typename A1>
|
| class Callback<R(A1)> : public internal::CallbackBase {
|
| public:
|
| - typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&);
|
| + typedef R(*PolymorphicInvoke)(
|
| + internal::InvokerStorageBase*,
|
| + typename internal::ParamTraits<A1>::ForwardType);
|
|
|
| Callback() : CallbackBase(NULL, NULL) { }
|
|
|
| @@ -272,7 +276,7 @@ class Callback<R(A1)> : public internal::CallbackBase {
|
| &invoker_holder.invoker_storage_) {
|
| }
|
|
|
| - R Run(const A1& a1) const {
|
| + R Run(typename internal::ParamTraits<A1>::ForwardType a1) const {
|
| PolymorphicInvoke f =
|
| reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
|
|
|
| @@ -283,8 +287,10 @@ class Callback<R(A1)> : public internal::CallbackBase {
|
| template <typename R, typename A1, typename A2>
|
| class Callback<R(A1, A2)> : public internal::CallbackBase {
|
| public:
|
| - typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&,
|
| - const A2&);
|
| + typedef R(*PolymorphicInvoke)(
|
| + internal::InvokerStorageBase*,
|
| + typename internal::ParamTraits<A1>::ForwardType,
|
| + typename internal::ParamTraits<A2>::ForwardType);
|
|
|
| Callback() : CallbackBase(NULL, NULL) { }
|
|
|
| @@ -302,8 +308,8 @@ class Callback<R(A1, A2)> : public internal::CallbackBase {
|
| &invoker_holder.invoker_storage_) {
|
| }
|
|
|
| - R Run(const A1& a1,
|
| - const A2& a2) const {
|
| + R Run(typename internal::ParamTraits<A1>::ForwardType a1,
|
| + typename internal::ParamTraits<A2>::ForwardType a2) const {
|
| PolymorphicInvoke f =
|
| reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
|
|
|
| @@ -315,9 +321,11 @@ class Callback<R(A1, A2)> : public internal::CallbackBase {
|
| template <typename R, typename A1, typename A2, typename A3>
|
| class Callback<R(A1, A2, A3)> : public internal::CallbackBase {
|
| public:
|
| - typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&,
|
| - const A2&,
|
| - const A3&);
|
| + typedef R(*PolymorphicInvoke)(
|
| + internal::InvokerStorageBase*,
|
| + typename internal::ParamTraits<A1>::ForwardType,
|
| + typename internal::ParamTraits<A2>::ForwardType,
|
| + typename internal::ParamTraits<A3>::ForwardType);
|
|
|
| Callback() : CallbackBase(NULL, NULL) { }
|
|
|
| @@ -335,9 +343,9 @@ class Callback<R(A1, A2, A3)> : public internal::CallbackBase {
|
| &invoker_holder.invoker_storage_) {
|
| }
|
|
|
| - R Run(const A1& a1,
|
| - const A2& a2,
|
| - const A3& a3) const {
|
| + R Run(typename internal::ParamTraits<A1>::ForwardType a1,
|
| + typename internal::ParamTraits<A2>::ForwardType a2,
|
| + typename internal::ParamTraits<A3>::ForwardType a3) const {
|
| PolymorphicInvoke f =
|
| reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
|
|
|
| @@ -350,10 +358,12 @@ class Callback<R(A1, A2, A3)> : public internal::CallbackBase {
|
| template <typename R, typename A1, typename A2, typename A3, typename A4>
|
| class Callback<R(A1, A2, A3, A4)> : public internal::CallbackBase {
|
| public:
|
| - typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&,
|
| - const A2&,
|
| - const A3&,
|
| - const A4&);
|
| + typedef R(*PolymorphicInvoke)(
|
| + internal::InvokerStorageBase*,
|
| + typename internal::ParamTraits<A1>::ForwardType,
|
| + typename internal::ParamTraits<A2>::ForwardType,
|
| + typename internal::ParamTraits<A3>::ForwardType,
|
| + typename internal::ParamTraits<A4>::ForwardType);
|
|
|
| Callback() : CallbackBase(NULL, NULL) { }
|
|
|
| @@ -371,10 +381,10 @@ class Callback<R(A1, A2, A3, A4)> : public internal::CallbackBase {
|
| &invoker_holder.invoker_storage_) {
|
| }
|
|
|
| - R Run(const A1& a1,
|
| - const A2& a2,
|
| - const A3& a3,
|
| - const A4& a4) const {
|
| + R Run(typename internal::ParamTraits<A1>::ForwardType a1,
|
| + typename internal::ParamTraits<A2>::ForwardType a2,
|
| + typename internal::ParamTraits<A3>::ForwardType a3,
|
| + typename internal::ParamTraits<A4>::ForwardType a4) const {
|
| PolymorphicInvoke f =
|
| reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
|
|
|
| @@ -389,11 +399,13 @@ template <typename R, typename A1, typename A2, typename A3, typename A4,
|
| typename A5>
|
| class Callback<R(A1, A2, A3, A4, A5)> : public internal::CallbackBase {
|
| public:
|
| - typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&,
|
| - const A2&,
|
| - const A3&,
|
| - const A4&,
|
| - const A5&);
|
| + typedef R(*PolymorphicInvoke)(
|
| + internal::InvokerStorageBase*,
|
| + typename internal::ParamTraits<A1>::ForwardType,
|
| + typename internal::ParamTraits<A2>::ForwardType,
|
| + typename internal::ParamTraits<A3>::ForwardType,
|
| + typename internal::ParamTraits<A4>::ForwardType,
|
| + typename internal::ParamTraits<A5>::ForwardType);
|
|
|
| Callback() : CallbackBase(NULL, NULL) { }
|
|
|
| @@ -411,11 +423,11 @@ class Callback<R(A1, A2, A3, A4, A5)> : public internal::CallbackBase {
|
| &invoker_holder.invoker_storage_) {
|
| }
|
|
|
| - R Run(const A1& a1,
|
| - const A2& a2,
|
| - const A3& a3,
|
| - const A4& a4,
|
| - const A5& a5) const {
|
| + R Run(typename internal::ParamTraits<A1>::ForwardType a1,
|
| + typename internal::ParamTraits<A2>::ForwardType a2,
|
| + typename internal::ParamTraits<A3>::ForwardType a3,
|
| + typename internal::ParamTraits<A4>::ForwardType a4,
|
| + typename internal::ParamTraits<A5>::ForwardType a5) const {
|
| PolymorphicInvoke f =
|
| reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
|
|
|
| @@ -431,12 +443,14 @@ template <typename R, typename A1, typename A2, typename A3, typename A4,
|
| typename A5, typename A6>
|
| class Callback<R(A1, A2, A3, A4, A5, A6)> : public internal::CallbackBase {
|
| public:
|
| - typedef R(*PolymorphicInvoke)(internal::InvokerStorageBase*, const A1&,
|
| - const A2&,
|
| - const A3&,
|
| - const A4&,
|
| - const A5&,
|
| - const A6&);
|
| + typedef R(*PolymorphicInvoke)(
|
| + internal::InvokerStorageBase*,
|
| + typename internal::ParamTraits<A1>::ForwardType,
|
| + typename internal::ParamTraits<A2>::ForwardType,
|
| + typename internal::ParamTraits<A3>::ForwardType,
|
| + typename internal::ParamTraits<A4>::ForwardType,
|
| + typename internal::ParamTraits<A5>::ForwardType,
|
| + typename internal::ParamTraits<A6>::ForwardType);
|
|
|
| Callback() : CallbackBase(NULL, NULL) { }
|
|
|
| @@ -454,12 +468,12 @@ class Callback<R(A1, A2, A3, A4, A5, A6)> : public internal::CallbackBase {
|
| &invoker_holder.invoker_storage_) {
|
| }
|
|
|
| - R Run(const A1& a1,
|
| - const A2& a2,
|
| - const A3& a3,
|
| - const A4& a4,
|
| - const A5& a5,
|
| - const A6& a6) const {
|
| + R Run(typename internal::ParamTraits<A1>::ForwardType a1,
|
| + typename internal::ParamTraits<A2>::ForwardType a2,
|
| + typename internal::ParamTraits<A3>::ForwardType a3,
|
| + typename internal::ParamTraits<A4>::ForwardType a4,
|
| + typename internal::ParamTraits<A5>::ForwardType a5,
|
| + typename internal::ParamTraits<A6>::ForwardType a6) const {
|
| PolymorphicInvoke f =
|
| reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
|
|
|
|
|