Skip to content

parity-util-mem: use ios compilation conditions same as macos. #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niklasad1 merged 2 commits into from
Feb 8, 2021
Merged

parity-util-mem: use ios compilation conditions same as macos. #522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d17fd6
parity-util-mem: use ios compilation conditions same as macos.
artemii235 Feb 8, 2021
ac1de72
Fix fmt.
artemii235 Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
parity-util-mem: use ios compilation conditions same as macos.
  • Loading branch information
@artemii235
artemii235 committed Feb 8, 2021
commit 2d17fd6bb77e4a4027ac654b83d2b0dcc47c95e9
2 changes: 1 addition & 1 deletion parity-util-mem/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
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(any(target_os = "macos", 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
View file
Open in desktop
Original file line number Diff line number Diff line change
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(any(target_os = "macos", target_os = "ios"), not(feature = "jemalloc-global"),), feature = "estimate-heapsize")))]
pub mod inner_allocator_use {

use super::*;
Expand Down