diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 00:11:40 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 00:11:40 +0000 |
| commit | a9f206fe4f79573c7c8f90242738a6dc909afc0c (patch) | |
| tree | cede65b54e3b779a4d6fd2ef74120b7f09e4b389 /base/tuple.h | |
| parent | db682d18fd97c10f34b0ac57c97f442b10a35207 (diff) | |
| download | chromium_src-a9f206fe4f79573c7c8f90242738a6dc909afc0c.zip chromium_src-a9f206fe4f79573c7c8f90242738a6dc909afc0c.tar.gz chromium_src-a9f206fe4f79573c7c8f90242738a6dc909afc0c.tar.bz2 | |
Eliminate 'if defiend(CHECK) to avoid having to different binaries for the same template function.
There is a new crash report but not caught by the CHECKS.
(http://crash/reportdetail?reportid=accf4c24431527ce#crashing_thread)
This could be because this ifdef generates two different objects of this template function and linker may be picking bad one.
BUG=chromium-os:7327
TEST=none
Review URL: http://codereview.chromium.org/5405003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tuple.h')
| -rw-r--r-- | base/tuple.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/base/tuple.h b/base/tuple.h index bfe6562..6b0d336 100644 --- a/base/tuple.h +++ b/base/tuple.h @@ -30,6 +30,10 @@ #define BASE_TUPLE_H__ #pragma once +#if defined(OS_CHROMEOS) +// To troubleshoot crosbug.com/7327. +#include "base/logging.h" +#endif // Traits ---------------------------------------------------------------------- // // A simple traits class for tuple arguments. @@ -545,7 +549,7 @@ inline void DispatchToMethod(ObjT* obj, Method method, const A& arg) { template <class ObjT, class Method, class A> inline void DispatchToMethod(ObjT* obj, Method method, const Tuple1<A>& arg) { -#if defined(OS_CHROMEOS) && defined(CHECK) +#if defined(OS_CHROMEOS) // To troubleshoot crosbug.com/7327. CHECK(obj); CHECK(&arg); |