M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation when the mint or alga features are enabled.

This commit is contained in:
Crozet Sébastien 2021-02-25 14:30:04 +01:00
parent 234e103e4b
commit 162a7ef09c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/conversion.rs
View File

@ -245,9 +245,9 @@ macro_rules! impl_from_into_mint_1D(
fn from(v: mint::$VT<N>) -> Self { fn from(v: mint::$VT<N>) -> Self {
unsafe { unsafe {
let mut res = Self::new_uninitialized(); let mut res = Self::new_uninitialized();
ptr::copy_nonoverlapping(&v.x, res.data.ptr_mut(), $SZ); ptr::copy_nonoverlapping(&v.x, (*res.as_mut_ptr()).data.ptr_mut(), $SZ);
res res.assume_init()
} }
} }
} }
@ -307,7 +307,7 @@ macro_rules! impl_from_into_mint_2D(
fn from(m: mint::$MV<N>) -> Self { fn from(m: mint::$MV<N>) -> Self {
unsafe { unsafe {
let mut res = Self::new_uninitialized(); let mut res = Self::new_uninitialized();
let mut ptr = (*res).data.ptr_mut(); let mut ptr = (*res.as_mut_ptr()).data.ptr_mut();
$( $(
ptr::copy_nonoverlapping(&m.$component.x, ptr, $SZRows); ptr::copy_nonoverlapping(&m.$component.x, ptr, $SZRows);
ptr = ptr.offset($SZRows); ptr = ptr.offset($SZRows);

4
src/base/matrix_alga.rs
View File

@ -433,8 +433,8 @@ where
"Matrix meet/join error: mismatched dimensions." "Matrix meet/join error: mismatched dimensions."
); );
let mut mres = unsafe { Self::new_uninitialized_generic(shape.0, shape.1) }; let mut mres = unsafe { crate::unimplemented_or_uninitialized_generic!(shape.0, shape.1) };
let mut jres = unsafe { Self::new_uninitialized_generic(shape.0, shape.1) }; let mut jres = unsafe { crate::unimplemented_or_uninitialized_generic!(shape.0, shape.1) };
for i in 0..shape.0.value() * shape.1.value() { for i in 0..shape.0.value() * shape.1.value() {
unsafe { unsafe {