diff options
author | mitchmindtree <mitchell.nordine@gmail.com> | 2015-02-22 00:40:23 +1100 |
---|---|---|
committer | mitchmindtree <mitchell.nordine@gmail.com> | 2015-02-22 00:40:23 +1100 |
commit | 0389c834e4b456ad6dcce4f687c69ab0e84beafa (patch) | |
tree | f363304dda14fd020e32f2e422c6022c625286e5 /src/win32 | |
parent | 9bb41bf2773a353804ab710bb65c0e21a4c22a20 (diff) | |
download | glutin-0389c834e4b456ad6dcce4f687c69ab0e84beafa.tar.gz glutin-0389c834e4b456ad6dcce4f687c69ab0e84beafa.zip |
RingBuf -> VecDeque for other platforms, as_slice_with_nul -> as_bytes_with_nul
Diffstat (limited to 'src/win32')
-rw-r--r-- | src/win32/init.rs | 2 | ||||
-rw-r--r-- | src/win32/mod.rs | 4 | ||||
-rw-r--r-- | src/win32/monitor.rs | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/win32/init.rs b/src/win32/init.rs index 246a6b7..fd454d3 100644 --- a/src/win32/init.rs +++ b/src/win32/init.rs @@ -171,7 +171,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O use libc; let addr = CString::from_slice(addr.as_bytes()); - let addr = addr.as_slice_with_nul().as_ptr(); + let addr = addr.as_bytes_with_nul().as_ptr(); unsafe { gl::wgl::GetProcAddress(addr) as *const libc::c_void diff --git a/src/win32/mod.rs b/src/win32/mod.rs index cfb573a..e47c6eb 100644 --- a/src/win32/mod.rs +++ b/src/win32/mod.rs @@ -1,7 +1,7 @@ use std::sync::atomic::AtomicBool; use std::ptr; use std::ffi::CString; -use std::collections::RingBuf; +use std::collections::VecDeque; use std::sync::mpsc::Receiver; use libc; use {CreationError, Event, MouseCursor}; @@ -192,7 +192,7 @@ impl Window { /// See the docs in the crate root file. pub fn get_proc_address(&self, addr: &str) -> *const () { let addr = CString::from_slice(addr.as_bytes()); - let addr = addr.as_slice_with_nul().as_ptr(); + let addr = addr.as_bytes_with_nul().as_ptr(); unsafe { let p = gl::wgl::GetProcAddress(addr) as *const (); diff --git a/src/win32/monitor.rs b/src/win32/monitor.rs index bcf27e2..fc9f20d 100644 --- a/src/win32/monitor.rs +++ b/src/win32/monitor.rs @@ -1,7 +1,7 @@ use winapi; use user32; -use std::collections::RingBuf; +use std::collections::VecDeque; /// Win32 implementation of the main `MonitorID` object. pub struct MonitorID { @@ -25,11 +25,11 @@ pub struct MonitorID { } /// Win32 implementation of the main `get_available_monitors` function. -pub fn get_available_monitors() -> RingBuf<MonitorID> { +pub fn get_available_monitors() -> VecDeque<MonitorID> { use std::{iter, mem, ptr}; // return value - let mut result = RingBuf::new(); + let mut result = VecDeque::new(); // enumerating the devices is done by querying device 0, then device 1, then device 2, etc. // until the query function returns null |