diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-02-08 02:46:55 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-02-09 00:17:40 -0800 |
| commit | d433b80e026960b28ba660ebdb09175237e02e05 (patch) | |
| tree | 8b18795290b7b6c9d717e14f07e7ce5b99eeff6b /src/libstd/unstable/mutex.rs | |
| parent | 49ac48db3fe2666751908668ba8e5ab16e2fb07a (diff) | |
| download | rust-d433b80e026960b28ba660ebdb09175237e02e05.tar.gz rust-d433b80e026960b28ba660ebdb09175237e02e05.zip | |
std: Add init and uninit to mem. Replace direct intrinsic usage
Diffstat (limited to 'src/libstd/unstable/mutex.rs')
| -rw-r--r-- | src/libstd/unstable/mutex.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/unstable/mutex.rs b/src/libstd/unstable/mutex.rs index e9df17ef514..3122e925e82 100644 --- a/src/libstd/unstable/mutex.rs +++ b/src/libstd/unstable/mutex.rs @@ -92,7 +92,7 @@ mod imp { use libc; use self::os::{PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, pthread_mutex_t, pthread_cond_t}; - use unstable::intrinsics; + use mem; type pthread_mutexattr_t = libc::c_void; type pthread_condattr_t = libc::c_void; @@ -208,8 +208,8 @@ mod imp { impl Mutex { pub unsafe fn new() -> Mutex { let mut m = Mutex { - lock: intrinsics::init(), - cond: intrinsics::init(), + lock: mem::init(), + cond: mem::init(), }; pthread_mutex_init(&mut m.lock, 0 as *libc::c_void); |
