diff options
| author | Nico Weber <thakis@chromium.org> | 2015-11-04 14:47:16 -0800 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-11-04 22:48:35 +0000 |
| commit | d380128613ba8ad96b3e9c65c06d4b4fe570bf85 (patch) | |
| tree | db593c4d38e972b23c5768d896b8dd4161b16c20 /base/ios | |
| parent | c46d2c6e07b82c69e3727ad947a2fede1b3793e6 (diff) | |
| download | chromium_src-d380128613ba8ad96b3e9c65c06d4b4fe570bf85.zip chromium_src-d380128613ba8ad96b3e9c65c06d4b4fe570bf85.tar.gz chromium_src-d380128613ba8ad96b3e9c65c06d4b4fe570bf85.tar.bz2 | |
ios: Stop using __weak.
Since we don't build with ARC enabled and without garbage collection,
__weak had no semantic meaning. Upstream clang wants to change
__weak to have ARC zeroing weak references semantics, but to not
silently change behavior, they're first making it an error to use __weak
without ARC. Replace __weak with comments so we can update
compilers.
Also remove a workaround that's no longer necessary.
Similar to https://codereview.chromium.org/1407103008/ on OS X.
BUG=550066,228650
R=stuartmorgan@chromium.org
TBR=thestig
Review URL: https://codereview.chromium.org/1424713006 .
Cr-Commit-Position: refs/heads/master@{#357920}
Diffstat (limited to 'base/ios')
| -rw-r--r-- | base/ios/crb_protocol_observers_unittest.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/ios/crb_protocol_observers_unittest.mm b/base/ios/crb_protocol_observers_unittest.mm index b8cf423..07f5cff 100644 --- a/base/ios/crb_protocol_observers_unittest.mm +++ b/base/ios/crb_protocol_observers_unittest.mm @@ -255,7 +255,7 @@ TEST_F(CRBProtocolObserversTest, NestedMutateObservers) { @end @implementation TestMutateObserver { - __weak id _observers; + id _observers; // weak } - (instancetype)initWithObserver:(CRBProtocolObservers*)observers { |