squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #59857 - jethrogb:jb/sgx-test, r=Centril

Browse source 
SGX target: fix cfg(test) build
This commit is contained in:
Mazdak Farrokhzad 2019-04-12 12:18:01 +02:00 committed by GitHub
commit c852cc5443
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/sys/sgx/alloc.rs
View file

@ -1,4 +1,4 @@
use crate::alloc::{self, GlobalAlloc, Layout, System};
use crate::alloc::{GlobalAlloc, Layout, System};
use super::waitqueue::SpinMutex;
@ -36,11 +36,11 @@ unsafe impl GlobalAlloc for System {
#[cfg(not(test))]
#[no_mangle]
pub unsafe extern "C" fn __rust_c_alloc(size: usize, align: usize) -> *mut u8 {
alloc::alloc(Layout::from_size_align_unchecked(size, align))
crate::alloc::alloc(Layout::from_size_align_unchecked(size, align))
}
#[cfg(not(test))]
#[no_mangle]
pub unsafe extern "C" fn __rust_c_dealloc(ptr: *mut u8, size: usize, align: usize) {
alloc::dealloc(ptr, Layout::from_size_align_unchecked(size, align))
crate::alloc::dealloc(ptr, Layout::from_size_align_unchecked(size, align))
}