Callback support for __fastcall and __stdcall functions.

base/bind_internal.h

Index: base/bind_internal.h
diff --git a/base/bind_internal.h b/base/bind_internal.h
index fe3764bfb5145c5da73fb5d68fb99108335f8f2e..d3fedd88f0cd78900726006faca87ec1a3f3d0eb 100644
--- a/base/bind_internal.h
+++ b/base/bind_internal.h
@@ -67,91 +67,91 @@ struct FunctionTraits;
 template <typename R>
 struct FunctionTraits<R(*)()> {
   typedef R (*NormalizedSig)();
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity 0.
 template <typename R, typename T>
 struct FunctionTraits<R(T::*)()> {
   typedef R (T::*NormalizedSig)();
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity 0.
 template <typename R, typename T>
 struct FunctionTraits<R(T::*)() const> {
   typedef R (T::*NormalizedSig)();
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Function: Arity 1.
 template <typename R, typename X1>
 struct FunctionTraits<R(*)(X1)> {
   typedef R (*NormalizedSig)(X1);
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity 1.
 template <typename R, typename T, typename X1>
 struct FunctionTraits<R(T::*)(X1)> {
   typedef R (T::*NormalizedSig)(X1);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity 1.
 template <typename R, typename T, typename X1>
 struct FunctionTraits<R(T::*)(X1) const> {
   typedef R (T::*NormalizedSig)(X1);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Function: Arity 2.
 template <typename R, typename X1, typename X2>
 struct FunctionTraits<R(*)(X1, X2)> {
   typedef R (*NormalizedSig)(X1, X2);
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity 2.
 template <typename R, typename T, typename X1, typename X2>
 struct FunctionTraits<R(T::*)(X1, X2)> {
   typedef R (T::*NormalizedSig)(X1, X2);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity 2.
 template <typename R, typename T, typename X1, typename X2>
 struct FunctionTraits<R(T::*)(X1, X2) const> {
   typedef R (T::*NormalizedSig)(X1, X2);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Function: Arity 3.
 template <typename R, typename X1, typename X2, typename X3>
 struct FunctionTraits<R(*)(X1, X2, X3)> {
   typedef R (*NormalizedSig)(X1, X2, X3);
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity 3.
 template <typename R, typename T, typename X1, typename X2, typename X3>
 struct FunctionTraits<R(T::*)(X1, X2, X3)> {
   typedef R (T::*NormalizedSig)(X1, X2, X3);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity 3.
 template <typename R, typename T, typename X1, typename X2, typename X3>
 struct FunctionTraits<R(T::*)(X1, X2, X3) const> {
   typedef R (T::*NormalizedSig)(X1, X2, X3);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Function: Arity 4.
 template <typename R, typename X1, typename X2, typename X3, typename X4>
 struct FunctionTraits<R(*)(X1, X2, X3, X4)> {
   typedef R (*NormalizedSig)(X1, X2, X3, X4);
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity 4.
@@ -159,7 +159,7 @@ template <typename R, typename T, typename X1, typename X2, typename X3,
     typename X4>
 struct FunctionTraits<R(T::*)(X1, X2, X3, X4)> {
   typedef R (T::*NormalizedSig)(X1, X2, X3, X4);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity 4.
@@ -167,7 +167,7 @@ template <typename R, typename T, typename X1, typename X2, typename X3,
     typename X4>
 struct FunctionTraits<R(T::*)(X1, X2, X3, X4) const> {
   typedef R (T::*NormalizedSig)(X1, X2, X3, X4);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Function: Arity 5.
@@ -175,7 +175,7 @@ template <typename R, typename X1, typename X2, typename X3, typename X4,
     typename X5>
 struct FunctionTraits<R(*)(X1, X2, X3, X4, X5)> {
   typedef R (*NormalizedSig)(X1, X2, X3, X4, X5);
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity 5.
@@ -183,7 +183,7 @@ template <typename R, typename T, typename X1, typename X2, typename X3,
     typename X4, typename X5>
 struct FunctionTraits<R(T::*)(X1, X2, X3, X4, X5)> {
   typedef R (T::*NormalizedSig)(X1, X2, X3, X4, X5);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity 5.
@@ -191,7 +191,7 @@ template <typename R, typename T, typename X1, typename X2, typename X3,
     typename X4, typename X5>
 struct FunctionTraits<R(T::*)(X1, X2, X3, X4, X5) const> {
   typedef R (T::*NormalizedSig)(X1, X2, X3, X4, X5);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Function: Arity 6.
@@ -199,7 +199,7 @@ template <typename R, typename X1, typename X2, typename X3, typename X4,
     typename X5, typename X6>
 struct FunctionTraits<R(*)(X1, X2, X3, X4, X5, X6)> {
   typedef R (*NormalizedSig)(X1, X2, X3, X4, X5, X6);
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity 6.
@@ -207,7 +207,7 @@ template <typename R, typename T, typename X1, typename X2, typename X3,
     typename X4, typename X5, typename X6>
 struct FunctionTraits<R(T::*)(X1, X2, X3, X4, X5, X6)> {
   typedef R (T::*NormalizedSig)(X1, X2, X3, X4, X5, X6);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity 6.
@@ -215,9 +215,13 @@ template <typename R, typename T, typename X1, typename X2, typename X3,
     typename X4, typename X5, typename X6>
 struct FunctionTraits<R(T::*)(X1, X2, X3, X4, X5, X6) const> {
   typedef R (T::*NormalizedSig)(X1, X2, X3, X4, X5, X6);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
+#if defined(OS_WIN)

[willchan no longer on Chromium, 2011/02/24 08:00:30]

Won't this include it within the base::internal namespace? Would that make it so
it's base::internal::base::internal?

What if you moved this to the very beginning of the file? After the other
includes. I think to make this work, you'd have to duplicate the forward
declaration for FunctionTraits in bind_internal_win.h, but that shouldn't be a
big deal.

The only other way I can see of getting this to work is to close the namespaces
here and reopen. It's kinda ugly. And it's nicer to have all the includes at the
top. So I guess I prefer my first suggestion.

Also, don't we need to include build/build_config.h for OS_WIN?

[awong, 2011/02/25 02:07:52]

Whoa...crap...yes it does.  I have no clue how this even compiled.  Something
weird must be happening with the namespace lookup.
Didn't realize it was declared there. Including.

+#include "base/bind_internal_win.h"
+#endif
+
 // InvokerN<>
 //
 // The InvokerN templates contain a static DoInvoke() function that is the key