summaryrefslogtreecommitdiffstats
path: root/base/callback.h.pump
diff options
context:
space:
mode:
authorjeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 23:37:57 +0000
committerjeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 23:37:57 +0000
commit088badbc399465ef8fc2ea9e5c12cc0c98c3bba6 (patch)
tree6f8ba6bd724899ed0cd44b190fa1ef3e6ceaa080 /base/callback.h.pump
parent65d07a4181448cd47e96681922271a7b06bbd582 (diff)
downloadchromium_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.pump')
-rw-r--r--base/callback.h.pump2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/callback.h.pump b/base/callback.h.pump
index d2285e9..2216a3c 100644
--- a/base/callback.h.pump
+++ b/base/callback.h.pump
@@ -293,7 +293,7 @@ class Callback<R($for ARG , [[A$(ARG)]])> : public internal::CallbackBase {
return f(bind_state_.get()[[]]
$if ARITY != 0 [[, ]]
$for ARG ,
- [[internal::CallbackForward(a$(ARG))]]);
+ [[a$(ARG)]]);
}
private: