diff options
| author | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2015-05-13 21:58:26 +0300 |
|---|---|---|
| committer | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2015-05-19 17:42:14 +0300 |
| commit | d9b9f4ee7de2b5a05547085382a7fc6e196f7c0d (patch) | |
| tree | 12c7e4703910ca2f83f06fc30541c1029b61be3b /src/liballoc | |
| parent | 9ee2335bfcc6974e73b344b948b71cacc1fc5ea4 (diff) | |
| download | rust-d9b9f4ee7de2b5a05547085382a7fc6e196f7c0d.tar.gz rust-d9b9f4ee7de2b5a05547085382a7fc6e196f7c0d.zip | |
fix conflicts
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/rc.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 88c5c38172a..b8d8e6ad0a1 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -543,7 +543,7 @@ impl<T: ?Sized> Drop for Rc<T> { unsafe { let ptr = *self._ptr; if !(*(&ptr as *const _ as *const *const ())).is_null() && - ptr as usize != mem::POST_DROP_USIZE { + ptr as *const () as usize != mem::POST_DROP_USIZE { self.dec_strong(); if self.strong() == 0 { // destroy the contained object @@ -1051,7 +1051,7 @@ impl<T: ?Sized> Drop for Weak<T> { unsafe { let ptr = *self._ptr; if !(*(&ptr as *const _ as *const *const ())).is_null() && - ptr as usize != mem::POST_DROP_USIZE { + ptr as *const () as usize != mem::POST_DROP_USIZE { self.dec_weak(); // the weak count starts at 1, and will only go to zero if all // the strong pointers have disappeared. |