summaryrefslogtreecommitdiffstats
path: root/base/bind_internal.h.pump
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-16 23:18:50 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-16 23:18:50 +0000
commitab30bda9bf5af1f6de7b12e5751a977c36f36e74 (patch)
tree6c849dd3cbaefa3419ab08550d07021b9ddf13fb /base/bind_internal.h.pump
parentaa2ad993cee8d371c40cdfd0beee83bfaba89ca4 (diff)
downloadchromium_src-ab30bda9bf5af1f6de7b12e5751a977c36f36e74.zip
chromium_src-ab30bda9bf5af1f6de7b12e5751a977c36f36e74.tar.gz
chromium_src-ab30bda9bf5af1f6de7b12e5751a977c36f36e74.tar.bz2
base::Bind: Increase the arity to 7.
This is required by a CL I have in the works. Stats from builds of Release Chrome target with -j12: Build time: -0.2%, within the noise. Size: No change in size of chrome binary. BUG=98542 TEST=none R=ajwong@chromium.org,akalin@chromium.org,willchan@chromium.org Review URL: http://codereview.chromium.org/8306008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/bind_internal.h.pump')
-rw-r--r--base/bind_internal.h.pump16
1 files changed, 8 insertions, 8 deletions
diff --git a/base/bind_internal.h.pump b/base/bind_internal.h.pump
index 429e13f..d72b2be 100644
--- a/base/bind_internal.h.pump
+++ b/base/bind_internal.h.pump
@@ -5,7 +5,7 @@ $$
$$ http://code.google.com/p/googletest/wiki/PumpManual
$$
-$var MAX_ARITY = 6
+$var MAX_ARITY = 7
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
@@ -39,15 +39,15 @@ namespace internal {
// The templates below handle the determination of each of these dimensions.
// In brief:
//
-// FunctionTraits<> -- Provides a normalied signature, and other traits.
+// FunctionTraits<> -- Provides a normalized signature, and other traits.
// InvokerN<> -- Provides a DoInvoke() function that actually executes
-// a calback.
+// a callback.
// InvokerStorageN<> -- Provides storage for the bound parameters, and
// typedefs to the above.
// IsWeakMethod<> -- Determines if we are binding a method to a WeakPtr<>.
//
// More details about the design of each class is included in a comment closer
-// to their defition.
+// to their definition.
// IsWeakMethod determines if we are binding a method to a WeakPtr<> for an
@@ -64,7 +64,7 @@ struct IsWeakMethod<true, WeakPtr<T> > : public true_type {};
// The FunctionTraits<> template determines the type of function, and also
// creates a NormalizedType used to select the InvokerN classes. It turns out
// that syntactically, you only really have 2 variations when invoking a
-// funciton pointer: normal, and method. One is invoked func_ptr(arg1). The
+// function pointer: normal, and method. One is invoked func_ptr(arg1). The
// other is invoked (*obj_->method_ptr(arg1)).
//
// However, in the type system, there are many more distinctions. In standard
@@ -74,7 +74,7 @@ struct IsWeakMethod<true, WeakPtr<T> > : public true_type {};
// a normalized signature.
//
// Having a NormalizedSignature signature, reduces the combinatoric
-// complexity of defintions for the InvokerN<> later. Even though there are
+// complexity of definitions for the InvokerN<> later. Even though there are
// only 2 syntactic variations on invoking a function, without normalizing the
// signature, there would need to be one specialization of InvokerN for each
// unique (function_type, bound_arg, unbound_args) tuple in order to match all
@@ -157,12 +157,12 @@ $for ARG [[
//
// DoInvoke() is a static function with a fixed signature that is independent
// of StorageType; its first argument is a pointer to the non-templated common
-// baseclass of StorageType. This lets us store pointer to DoInvoke() in a
+// base class of StorageType. This lets us store pointer to DoInvoke() in a
// function pointer that has knowledge of the specific StorageType, and thus
// no knowledge of the bound function and bound parameter types.
//
// As long as we ensure that DoInvoke() is only used with pointers there were
-// upcasted from the correct StorageType, we can be sure that execution is
+// up-casted from the correct StorageType, we can be sure that execution is
// safe.
//
// The InvokerN templates are the only point that knows the number of bound