diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-08-06 11:59:40 +0200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-08-26 16:07:32 +1200 |
| commit | 52ef46251ede1ff51e5d5621d5fe2614e950f963 (patch) | |
| tree | 481371289f467bc89a6d6dc769635dac1d47a6cb /src/libdebug | |
| parent | 3e626375d8d2226a203bf6ea6e98dab14774c59f (diff) | |
| download | rust-52ef46251ede1ff51e5d5621d5fe2614e950f963.tar.gz rust-52ef46251ede1ff51e5d5621d5fe2614e950f963.zip | |
Rebasing changes
Diffstat (limited to 'src/libdebug')
| -rw-r--r-- | src/libdebug/reflect.rs | 2 | ||||
| -rw-r--r-- | src/libdebug/repr.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libdebug/reflect.rs b/src/libdebug/reflect.rs index 0d7209b5999..b89ea4d373d 100644 --- a/src/libdebug/reflect.rs +++ b/src/libdebug/reflect.rs @@ -251,7 +251,7 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> { } #[cfg(not(stage0))] fn visit_evec_fixed(&mut self, n: uint, sz: uint, align: uint, - inner: *TyDesc) -> bool { + inner: *const TyDesc) -> bool { self.align(align); if ! self.inner.visit_evec_fixed(n, sz, align, inner) { return false; diff --git a/src/libdebug/repr.rs b/src/libdebug/repr.rs index c810e1f6473..20f96d24a5f 100644 --- a/src/libdebug/repr.rs +++ b/src/libdebug/repr.rs @@ -342,7 +342,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> { #[cfg(not(stage0))] fn visit_evec_fixed(&mut self, n: uint, sz: uint, _align: uint, - inner: *TyDesc) -> bool { + inner: *const TyDesc) -> bool { let assumed_size = if sz == 0 { n } else { sz }; self.get::<()>(|this, b| { this.write_vec_range(b, assumed_size, inner) |