summaryrefslogtreecommitdiffstats
path: root/base/bind_internal.h.pump
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 21:12:58 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 21:12:58 +0000
commit206a2ae8a1ebd2b040753fff7da61bbca117757f (patch)
tree8ca9b401ccb608dada5e388d0b7905ed2e140fe1 /base/bind_internal.h.pump
parentb06392858ab76a6720352022f224b1144af06548 (diff)
downloadchromium_src-206a2ae8a1ebd2b040753fff7da61bbca117757f.zip
chromium_src-206a2ae8a1ebd2b040753fff7da61bbca117757f.tar.gz
chromium_src-206a2ae8a1ebd2b040753fff7da61bbca117757f.tar.bz2
Redo r113722 - Add Pass(), which implements move semantics, to scoped_ptr, scoped_array....
-- This time for sure. -- Add Pass(), which implements move semantics, to scoped_ptr, scoped_array, and scoped_ptr_malloc. This modification to the scopers implements the "moveable but not copyable" semantics that were introduced in C++11's unique_ptr<>. With this, is now possible to use scopers as an argument type or a return type. This signifies, in the type system, transfer of ownership into a function or out of a function respectively. Calling, or returning such a function MUST use the temporary resulting from a function or explicit cast. This distinction makes it possible to avoid the implicit ownership transfer issues of auto_ptr, but still allow us to have compiler enforced ownership transfer. Also adds a Passed() helper that allows using a scoper with Bind(). Original Review URL: http://codereview.chromium.org/8774032 BUG=96118 TEST=new unittests Review URL: http://codereview.chromium.org/9018037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/bind_internal.h.pump')
-rw-r--r--base/bind_internal.h.pump15
1 files changed, 7 insertions, 8 deletions
diff --git a/base/bind_internal.h.pump b/base/bind_internal.h.pump
index 53dcbd3..7fd63d8 100644
--- a/base/bind_internal.h.pump
+++ b/base/bind_internal.h.pump
@@ -82,7 +82,6 @@ namespace internal {
// into the Bind() system, doing most of the type resolution.
// There are ARITY BindState types.
-
// RunnableAdapter<>
//
// The RunnableAdapter<> templates provide a uniform interface for invoking
@@ -121,7 +120,7 @@ class RunnableAdapter<R(*)($for ARG , [[A$(ARG)]])> {
}
R Run($for ARG , [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) {
- return function_($for ARG , [[a$(ARG)]]);
+ return function_($for ARG , [[CallbackForward(a$(ARG))]]);
}
private:
@@ -143,7 +142,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG)]]);
R Run(T* object[[]]
$if ARITY > 0[[, ]] $for ARG, [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) {
- return (object->*method_)($for ARG , [[a$(ARG)]]);
+ return (object->*method_)($for ARG , [[CallbackForward(a$(ARG))]]);
}
private:
@@ -165,7 +164,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG)]]);
R Run(const T* object[[]]
$if ARITY > 0[[, ]] $for ARG, [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) {
- return (object->*method_)($for ARG , [[a$(ARG)]]);
+ return (object->*method_)($for ARG , [[CallbackForward(a$(ARG))]]);
}
private:
@@ -291,7 +290,7 @@ struct InvokeHelper<false, ReturnType, Runnable,
void($for ARG , [[A$(ARG)]])> {
static ReturnType MakeItSo(Runnable runnable[[]]
$if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
- return runnable.Run($for ARG , [[a$(ARG)]]);
+ return runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
}
};
@@ -301,7 +300,7 @@ struct InvokeHelper<false, void, Runnable,
void($for ARG , [[A$(ARG)]])> {
static void MakeItSo(Runnable runnable[[]]
$if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
- runnable.Run($for ARG , [[a$(ARG)]]);
+ runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
}
};
@@ -316,7 +315,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
return;
}
- runnable.Run($for ARG , [[a$(ARG)]]);
+ runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
}
};
@@ -404,7 +403,7 @@ typename CallbackParamTraits<X$(UNBOUND_ARG)>::ForwardType x$(UNBOUND_ARG)
]]
)>
::MakeItSo(storage->runnable_
-$if ARITY > 0[[, ]] $for ARG , [[x$(ARG)]]);
+$if ARITY > 0[[, ]] $for ARG , [[CallbackForward(x$(ARG))]]);
}
};