| commit | f6e3f59db2b7a2c3bbc250143245800b219841ee | [log] [tgz] |
|---|---|---|
| author | Gaurav Dhol <[email protected]> | Mon Oct 29 17:22:41 2018 |
| committer | Commit Bot <[email protected]> | Mon Oct 29 17:22:41 2018 |
| tree | 83a7596ca927323d56f1cf53fba3f9fa8a70ee0a | |
| parent | 5fb3223eff0bb1dda37bc4292e4dc18da8a1cd79 [diff] [blame] |
Fix compile error: redefined struct FunctorTraits ../..\base/bind_internal.h(415,8): error: redefinition of 'FunctorTraits<R (*)(Args...) __attribute__((stdcall))>' Bug: 893460 Change-Id: I370eb3d4cebf3171fb143cba9b022696c5a1ebb2 Reviewed-on: https://chromium-review.googlesource.com/c/1298831 Commit-Queue: Bruce Dawson <[email protected]> Reviewed-by: Taiju Tsuiki <[email protected]> Cr-Commit-Position: refs/heads/master@{#603540}
diff --git a/base/bind_internal.h b/base/bind_internal.h index aff03a6..d8f574a 100644 --- a/base/bind_internal.h +++ b/base/bind_internal.h
@@ -417,7 +417,7 @@ } }; -#if defined(OS_WIN) && !defined(ARCH_CPU_X86_64) +#if defined(OS_WIN) && !defined(ARCH_CPU_64_BITS) // For functions. template <typename R, typename... Args> @@ -445,7 +445,7 @@ } }; -#endif // defined(OS_WIN) && !defined(ARCH_CPU_X86_64) +#endif // defined(OS_WIN) && !defined(ARCH_CPU_64_BITS) #if defined(OS_MACOSX)