Index: base/bind_internal.h.pump |
diff --git a/base/bind_internal.h.pump b/base/bind_internal.h.pump |
index b1ba2d736fac4f6cf36604349c3fb70d016c6be7..f7ed74af3c6f82ce675380b9ba3635fa60160020 100644 |
--- a/base/bind_internal.h.pump |
+++ b/base/bind_internal.h.pump |
@@ -76,7 +76,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 +84,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,11 +92,15 @@ 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 |
+#if defined(OS_WIN) |
+#include "base/bind_internal_win.h" |
+#endif |
+ |
// InvokerN<> |
// |
// The InvokerN templates contain a static DoInvoke() function that is the key |