diff options
author | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 23:37:57 +0000 |
---|---|---|
committer | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 23:37:57 +0000 |
commit | 088badbc399465ef8fc2ea9e5c12cc0c98c3bba6 (patch) | |
tree | 6f8ba6bd724899ed0cd44b190fa1ef3e6ceaa080 /base/callback.h | |
parent | 65d07a4181448cd47e96681922271a7b06bbd582 (diff) | |
download | chromium_src-088badbc399465ef8fc2ea9e5c12cc0c98c3bba6.zip chromium_src-088badbc399465ef8fc2ea9e5c12cc0c98c3bba6.tar.gz chromium_src-088badbc399465ef8fc2ea9e5c12cc0c98c3bba6.tar.bz2 |
Revert 115441 - Redo r113722 - Add Pass(), which implements move semantics, to scoped_ptr, scoped_array....
(This undoes the revert in r114247. Win canaries still can't link, but
this change has been deemed safe).
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().
BUG=96118
TEST=new unittests
Review URL: http://codereview.chromium.org/9021032
TBR=ajwong@chromium.org
Review URL: http://codereview.chromium.org/8949057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/callback.h')
-rw-r--r-- | base/callback.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/base/callback.h b/base/callback.h index 318bff0..abaa438 100644 --- a/base/callback.h +++ b/base/callback.h @@ -312,7 +312,7 @@ class Callback<R(A1)> : public internal::CallbackBase { PolymorphicInvoke f = reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); - return f(bind_state_.get(), internal::CallbackForward(a1)); + return f(bind_state_.get(), a1); } private: @@ -353,8 +353,8 @@ class Callback<R(A1, A2)> : public internal::CallbackBase { PolymorphicInvoke f = reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); - return f(bind_state_.get(), internal::CallbackForward(a1), - internal::CallbackForward(a2)); + return f(bind_state_.get(), a1, + a2); } private: @@ -397,9 +397,9 @@ class Callback<R(A1, A2, A3)> : public internal::CallbackBase { PolymorphicInvoke f = reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); - return f(bind_state_.get(), internal::CallbackForward(a1), - internal::CallbackForward(a2), - internal::CallbackForward(a3)); + return f(bind_state_.get(), a1, + a2, + a3); } private: @@ -444,10 +444,10 @@ class Callback<R(A1, A2, A3, A4)> : public internal::CallbackBase { PolymorphicInvoke f = reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); - return f(bind_state_.get(), internal::CallbackForward(a1), - internal::CallbackForward(a2), - internal::CallbackForward(a3), - internal::CallbackForward(a4)); + return f(bind_state_.get(), a1, + a2, + a3, + a4); } private: @@ -495,11 +495,11 @@ class Callback<R(A1, A2, A3, A4, A5)> : public internal::CallbackBase { PolymorphicInvoke f = reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); - return f(bind_state_.get(), internal::CallbackForward(a1), - internal::CallbackForward(a2), - internal::CallbackForward(a3), - internal::CallbackForward(a4), - internal::CallbackForward(a5)); + return f(bind_state_.get(), a1, + a2, + a3, + a4, + a5); } private: @@ -549,12 +549,12 @@ class Callback<R(A1, A2, A3, A4, A5, A6)> : public internal::CallbackBase { PolymorphicInvoke f = reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); - return f(bind_state_.get(), internal::CallbackForward(a1), - internal::CallbackForward(a2), - internal::CallbackForward(a3), - internal::CallbackForward(a4), - internal::CallbackForward(a5), - internal::CallbackForward(a6)); + return f(bind_state_.get(), a1, + a2, + a3, + a4, + a5, + a6); } private: @@ -606,13 +606,13 @@ class Callback<R(A1, A2, A3, A4, A5, A6, A7)> : public internal::CallbackBase { PolymorphicInvoke f = reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); - return f(bind_state_.get(), internal::CallbackForward(a1), - internal::CallbackForward(a2), - internal::CallbackForward(a3), - internal::CallbackForward(a4), - internal::CallbackForward(a5), - internal::CallbackForward(a6), - internal::CallbackForward(a7)); + return f(bind_state_.get(), a1, + a2, + a3, + a4, + a5, + a6, + a7); } private: |