Skip to content

Commit

Permalink
parity-util-mem: use ios compilation conditions same as macos.
Browse files Browse the repository at this point in the history
  • Loading branch information
artemii235 committed Jan 27, 2021
1 parent 38627a6 commit 72702ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion parity-util-mem/src/lib.rs
Expand Up @@ -46,7 +46,7 @@ cfg_if::cfg_if! {

pub mod allocators;

#[cfg(any(all(target_os = "macos", not(feature = "jemalloc-global"),), feature = "estimate-heapsize"))]
#[cfg(any(all(target_os = "macos", not(feature = "jemalloc-global"),), all(target_os = "ios", not(feature = "jemalloc-global"),), feature = "estimate-heapsize"))]
pub mod sizeof;

/// This is a copy of patched crate `malloc_size_of` as a module.
Expand Down
2 changes: 1 addition & 1 deletion parity-util-mem/src/malloc_size.rs
Expand Up @@ -216,7 +216,7 @@ pub trait MallocConditionalShallowSizeOf {
fn conditional_shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize;
}

#[cfg(not(any(all(target_os = "macos", not(feature = "jemalloc-global"),), feature = "estimate-heapsize")))]
#[cfg(not(any(all(target_os = "macos", not(feature = "jemalloc-global"),), all(target_os = "ios", not(feature = "jemalloc-global"),), feature = "estimate-heapsize")))]
pub mod inner_allocator_use {

use super::*;
Expand Down

0 comments on commit 72702ef

Please sign in to comment.