Callback support for __fastcall and __stdcall functions.

base/bind_internal.h.pump

Index: base/bind_internal.h.pump
diff --git a/base/bind_internal.h.pump b/base/bind_internal.h.pump
index b1ba2d736fac4f6cf36604349c3fb70d016c6be7..187821ad58e03447da3d9d31022ae4b823838999 100644
--- a/base/bind_internal.h.pump
+++ b/base/bind_internal.h.pump
@@ -15,10 +15,16 @@ $var MAX_ARITY = 6
 #define BASE_BIND_INTERNAL_H_
 #pragma once
 
+#include "build/build_config.h"

[willchan no longer on Chromium, 2011/02/25 21:52:09]

You can sort this alphabetically, it'll still be ahead of the defined(OS_WIN)
since that goes last, as specified in
https://sites.google.com/a/chromium.org/dev/developers/coding-style#TOC-Platf....

+
 #include "base/bind_helpers.h"
 #include "base/callback_internal.h"
 #include "base/template_util.h"
 
+#if defined(OS_WIN)
+#include "base/bind_internal_win.h"
+#endif
+
 namespace base {
 namespace internal {
 
@@ -76,7 +82,7 @@ template <typename R[[]]
 $if ARITY > 0[[, ]] $for ARG , [[typename X$(ARG)]]>
 struct FunctionTraits<R(*)($for ARG , [[X$(ARG)]])> {
   typedef R (*NormalizedSig)($for ARG , [[X$(ARG)]]);
-  typedef base::false_type IsMethod;
+  typedef false_type IsMethod;
 };
 
 // Method: Arity $(ARITY).
@@ -84,7 +90,7 @@ template <typename R, typename T[[]]
 $if ARITY > 0[[, ]] $for ARG , [[typename X$(ARG)]]>
 struct FunctionTraits<R(T::*)($for ARG , [[X$(ARG)]])> {
   typedef R (T::*NormalizedSig)($for ARG , [[X$(ARG)]]);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 // Const Method: Arity $(ARITY).
@@ -92,7 +98,7 @@ template <typename R, typename T[[]]
 $if ARITY > 0[[, ]] $for ARG , [[typename X$(ARG)]]>
 struct FunctionTraits<R(T::*)($for ARG , [[X$(ARG)]]) const> {
   typedef R (T::*NormalizedSig)($for ARG , [[X$(ARG)]]);
-  typedef base::true_type IsMethod;
+  typedef true_type IsMethod;
 };
 
 ]]  $$for ARITY