poanetwork
/
parity-common
mirror of https://github.com/poanetwork/parity-common.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix error on nightly

This commit is contained in:
Niklas Adofsson 2018-06-12 13:30:27 +02:00
parent 94b28c822e
commit ffa7c44990
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fixed-hash/src/hash.rs
View File

@ -319,7 +319,7 @@ macro_rules! construct_hash {
} }
} }
#[cfg(feature="heapsizeof")] #[cfg(all(feature="heapsizeof", feature="libc", not(target_os = "unknown")))]
#[macro_export] #[macro_export]
#[doc(hidden)] #[doc(hidden)]
macro_rules! impl_heapsize_for_hash { macro_rules! impl_heapsize_for_hash {
@ -332,7 +332,7 @@ macro_rules! impl_heapsize_for_hash {
} }
} }
#[cfg(not(feature="heapsizeof"))] #[cfg(any(not(feature="heapsizeof"), not(feature="libc"), target_os = "unknown"))]
#[macro_export] #[macro_export]
#[doc(hidden)] #[doc(hidden)]
macro_rules! impl_heapsize_for_hash { macro_rules! impl_heapsize_for_hash {
@ -425,19 +425,6 @@ macro_rules! impl_std_for_hash_internals {
($from: ident, $size: tt) => {} ($from: ident, $size: tt) => {}
} }
#[cfg(all(feature="libc", not(target_os = "unknown")))]
#[macro_export]
#[doc(hidden)]
macro_rules! impl_heapsize_for_hash {
($name: ident) => {
impl $crate::heapsize::HeapSizeOf for $name {
fn heap_size_of_children(&self) -> usize {
0
}
}
}
}
#[cfg(all(feature="libc", not(target_os = "unknown")))] #[cfg(all(feature="libc", not(target_os = "unknown")))]
#[macro_export] #[macro_export]
#[doc(hidden)] #[doc(hidden)]