diff options
author | dcheng <dcheng@chromium.org> | 2014-09-16 22:35:23 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 05:35:33 +0000 |
commit | 1e6ba5a2c981b0b0c82d40e45e712c02480f2d6c (patch) | |
tree | e74fc1912d7a84d63f601ed85944a1ab5b58fa9b /base | |
parent | 1f994399ef31e88d09141a071e3ef08c3adfdead (diff) | |
download | chromium_src-1e6ba5a2c981b0b0c82d40e45e712c02480f2d6c.zip chromium_src-1e6ba5a2c981b0b0c82d40e45e712c02480f2d6c.tar.gz chromium_src-1e6ba5a2c981b0b0c82d40e45e712c02480f2d6c.tar.bz2 |
Disable implicit conversions of scoped_refptr to T* on CrOS.
The implicit conversion has already been disabled for Linux builds for
some time now. https://codereview.chromium.org/510323002 explains the
rationale for proceeding incrementally.
BUG=110610
Review URL: https://codereview.chromium.org/572713003
Cr-Commit-Position: refs/heads/master@{#295234}
Diffstat (limited to 'base')
-rw-r--r-- | base/memory/ref_counted.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/memory/ref_counted.h b/base/memory/ref_counted.h index cb22fde6..e12a823 100644 --- a/base/memory/ref_counted.h +++ b/base/memory/ref_counted.h @@ -17,7 +17,7 @@ #include "base/threading/thread_collision_warner.h" #include "build/build_config.h" -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) #define DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR #endif |