diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-04-03 12:01:58 +0200 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-04-03 12:01:58 +0200 |
| commit | cd7c1264bf8e3ad927facbecfaabdf9432000ab3 (patch) | |
| tree | 777ac6e5172a89729f79271aea18d004a4d2b190 | |
| parent | 631cedb58c67b3eb18121e872fcd8d5fcc3831e1 (diff) | |
| parent | 9c21758bb73f18cf8f6a3f61f426af8bde00964a (diff) | |
| download | glutin-cd7c1264bf8e3ad927facbecfaabdf9432000ab3.tar.gz glutin-cd7c1264bf8e3ad927facbecfaabdf9432000ab3.zip | |
Merge pull request #352 from SSheldon/stable_rust
Update OSX to compile on stable rust
| -rw-r--r-- | build.rs | 2 | ||||
| -rw-r--r-- | examples-disabled/fullscreen.rs | 2 | ||||
| -rw-r--r-- | examples/cursor.rs | 2 | ||||
| -rw-r--r-- | examples/grabbing.rs | 2 | ||||
| -rw-r--r-- | examples/multiwindow.rs | 2 | ||||
| -rw-r--r-- | examples/vsync.rs | 2 | ||||
| -rw-r--r-- | examples/window.rs | 2 | ||||
| -rw-r--r-- | src/cocoa/mod.rs | 10 |
8 files changed, 0 insertions, 24 deletions
@@ -1,5 +1,3 @@ -#![feature(convert)] - extern crate gl_generator; extern crate khronos_api; diff --git a/examples-disabled/fullscreen.rs b/examples-disabled/fullscreen.rs index 37ea366..3b9e2c1 100644 --- a/examples-disabled/fullscreen.rs +++ b/examples-disabled/fullscreen.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/cursor.rs b/examples/cursor.rs index c5bcbd6..0dced66 100644 --- a/examples/cursor.rs +++ b/examples/cursor.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/grabbing.rs b/examples/grabbing.rs index 8088774..8a46750 100644 --- a/examples/grabbing.rs +++ b/examples/grabbing.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs index 9256555..ce97266 100644 --- a/examples/multiwindow.rs +++ b/examples/multiwindow.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/vsync.rs b/examples/vsync.rs index 768bfc0..ec9ea79 100644 --- a/examples/vsync.rs +++ b/examples/vsync.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/window.rs b/examples/window.rs index 0e2a3cf..1d3b615 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/src/cocoa/mod.rs b/src/cocoa/mod.rs index e756aba..ca9d888 100644 --- a/src/cocoa/mod.rs +++ b/src/cocoa/mod.rs @@ -719,15 +719,5 @@ impl Clone for IdRef { } IdRef(self.0) } - - fn clone_from(&mut self, source: &IdRef) { - if source.0 != nil { - let _: id = unsafe { msg_send![source.0, retain] }; - } - if self.0 != nil { - let _: () = unsafe { msg_send![self.0, release] }; - } - self.0 = source.0; - } } |