aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Brubeck <mbrubeck@limpet.net>2014-07-24 12:41:13 -0700
committerMatt Brubeck <mbrubeck@limpet.net>2014-07-24 17:19:05 -0700
commitfeae7d0b5d141c2cfd7d4ac804edf18ff4a1b80f (patch)
tree7093462881de6aa5df7b90e3562a73cbe796aad3
parenta14d3b2102b8d69e0bcf361dc5c5fb0c11788637 (diff)
downloadservo-feae7d0b5d141c2cfd7d4ac804edf18ff4a1b80f.tar.gz
servo-feae7d0b5d141c2cfd7d4ac804edf18ff4a1b80f.zip
Add explicit cast from size_t to u64.
Fixes compile error on non-64-bit targets.
-rw-r--r--src/components/util/memory.rs2
m---------src/support/stringcache/string-cache0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/components/util/memory.rs b/src/components/util/memory.rs
index 7dc98013912..1484b1cfd9f 100644
--- a/src/components/util/memory.rs
+++ b/src/components/util/memory.rs
@@ -156,7 +156,7 @@ fn get_jemalloc_stat(name: &'static str) -> Option<u64> {
unsafe {
rv = je_mallctl(c_name.unwrap(), oldp, &mut oldlen, mut_null(), 0);
}
- if rv == 0 { Some(old) } else { None }
+ if rv == 0 { Some(old as u64) } else { None }
}
// Like std::macros::try!, but for Option<>.
diff --git a/src/support/stringcache/string-cache b/src/support/stringcache/string-cache
-Subproject 00caade726945dd8a7bbe81d4f8e77c0177d8ee
+Subproject 8828119c5d789452685c82fa71a1dec7f6bd4b0