Skip to content

GitLab

T
tangled
Commit ad794d3c authored by dcheng's avatar dcheng Committed by Commit bot
Browse files
Options

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}
parent ec857a14
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
base/memory/ref_counted.h
View file @ ad794d3c
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "base/threading/thread_collision_warner.h" #include "base/threading/thread_collision_warner.h"
#include "build/build_config.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 #define DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment