Merge branch 'master' into reorgjdb

2016-03-11 20:05:41 +04:00
parent 04af38bb0d 03a4f9e268
commit 87fb0b31eb
5 changed files with 9 additions and 8 deletions
--- a/util/bigint/src/uint.rs
+++ b/util/bigint/src/uint.rs
@@ -36,6 +36,9 @@
 //! The functions here are designed to be fast.
 //!

+
+#[cfg(all(asm_available, target_arch="x86_64"))]
+use std::mem;
 use std::fmt;
 use std::cmp;