Merge pull request #352 from SSheldon/stable_rust

Update OSX to compile on stable rust
This commit is contained in:
tomaka 2015-04-03 12:01:58 +02:00
commit cd7c1264bf
8 changed files with 0 additions and 24 deletions

View file

@ -1,5 +1,3 @@
#![feature(convert)]
extern crate gl_generator; extern crate gl_generator;
extern crate khronos_api; extern crate khronos_api;

View file

@ -1,5 +1,3 @@
#![feature(std_misc)]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
#[macro_use] #[macro_use]
extern crate android_glue; extern crate android_glue;

View file

@ -1,5 +1,3 @@
#![feature(std_misc)]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
#[macro_use] #[macro_use]
extern crate android_glue; extern crate android_glue;

View file

@ -1,5 +1,3 @@
#![feature(std_misc)]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
#[macro_use] #[macro_use]
extern crate android_glue; extern crate android_glue;

View file

@ -1,5 +1,3 @@
#![feature(std_misc)]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
#[macro_use] #[macro_use]
extern crate android_glue; extern crate android_glue;

View file

@ -1,5 +1,3 @@
#![feature(std_misc)]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
#[macro_use] #[macro_use]
extern crate android_glue; extern crate android_glue;

View file

@ -1,5 +1,3 @@
#![feature(std_misc)]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
#[macro_use] #[macro_use]
extern crate android_glue; extern crate android_glue;

View file

@ -719,15 +719,5 @@ impl Clone for IdRef {
} }
IdRef(self.0) 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;
}
} }