diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-10 23:55:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-11 06:55:44 +0000 |
| commit | ad794d3c472690a8f9ac1772b56829185c177d00 (patch) | |
| tree | 895c96f63a3187e7e60749191db0806b2f29eeb9 /base/memory | |
| parent | ec857a14cb939730c846a2bfe6ae508a20b83eb2 (diff) | |
| download | chromium_src-ad794d3c472690a8f9ac1772b56829185c177d00.zip chromium_src-ad794d3c472690a8f9ac1772b56829185c177d00.tar.gz chromium_src-ad794d3c472690a8f9ac1772b56829185c177d00.tar.bz2 | |
Disable implicit conversions from scoped_refptr to T* on iOS.
BUG=110610
Review URL: https://codereview.chromium.org/643193002
Cr-Commit-Position: refs/heads/master@{#299238}
Diffstat (limited to 'base/memory')
| -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 1000056..7869e72 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_MACOSX) && !defined(OS_IOS)) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_ANDROID) #define DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR #endif |