From 1aa595a90ece2347a35adb94cba526633f411062 Mon Sep 17 00:00:00 2001 From: Eduard Burtescu Date: Wed, 27 Apr 2016 18:24:47 +0000 Subject: [PATCH] Don't place a raw pointer in a static. --- src/ffi.rs | 5 ++++- src/lib.rs | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ffi.rs b/src/ffi.rs index 88c9529..4b66c05 100644 --- a/src/ffi.rs +++ b/src/ffi.rs @@ -131,8 +131,11 @@ pub fn dispatch_get_main_queue() -> dispatch_queue_t { &_dispatch_main_q as *const _ as dispatch_queue_t } +pub fn dispatch_get_attr_concurrent_queue() -> dispatch_queue_attr_t { + &_dispatch_queue_attr_concurrent +} + pub const DISPATCH_QUEUE_SERIAL: dispatch_queue_attr_t = 0 as dispatch_queue_attr_t; -pub static DISPATCH_QUEUE_CONCURRENT: dispatch_queue_attr_t = &_dispatch_queue_attr_concurrent; pub const DISPATCH_QUEUE_PRIORITY_HIGH: c_long = 2; pub const DISPATCH_QUEUE_PRIORITY_DEFAULT: c_long = 0; diff --git a/src/lib.rs b/src/lib.rs index 200e3b6..6d0a7b3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -71,7 +71,9 @@ impl QueueAttribute { fn as_raw(&self) -> dispatch_queue_attr_t { match *self { QueueAttribute::Serial => DISPATCH_QUEUE_SERIAL, - QueueAttribute::Concurrent => DISPATCH_QUEUE_CONCURRENT, + QueueAttribute::Concurrent => { + dispatch_get_attr_concurrent_queue() + } } } }