From 13df4d7c3cd8cea4ef3603df63623ae4c3bbe4a5 Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Sun, 30 Mar 2014 15:59:12 +0200 Subject: [PATCH] Allow deriving(Eq) for individual cases using raw pointers. --- src/sdl2/mouse.rs | 2 +- src/sdl2/pixels.rs | 4 ++-- src/sdl2/render.rs | 4 ++-- src/sdl2/surface.rs | 2 +- src/sdl2/video.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/sdl2/mouse.rs b/src/sdl2/mouse.rs index 325b7721..54e52e0e 100644 --- a/src/sdl2/mouse.rs +++ b/src/sdl2/mouse.rs @@ -71,7 +71,7 @@ pub enum SystemCursor { HandCursor = ll::SDL_SYSTEM_CURSOR_HAND, } -#[deriving(Eq)] +#[deriving(Eq)] #[allow(raw_pointer_deriving)] pub struct Cursor { raw: *ll::SDL_Cursor, owned: bool diff --git a/src/sdl2/pixels.rs b/src/sdl2/pixels.rs index 3be90ef3..4610c122 100644 --- a/src/sdl2/pixels.rs +++ b/src/sdl2/pixels.rs @@ -87,7 +87,7 @@ pub mod ll { pub fn SDL_MapRGBA(format: *SDL_PixelFormat, r: uint8_t, g: uint8_t, b: uint8_t, a: uint8_t) -> uint32_t; } } -#[deriving(Eq)] +#[deriving(Eq)] #[allow(raw_pointer_deriving)] pub struct Palette { raw: *ll::SDL_Palette } @@ -130,7 +130,7 @@ impl rand::Rand for Color { } } -#[deriving(Eq)] +#[deriving(Eq)] #[allow(raw_pointer_deriving)] pub struct PixelFormat { raw: *ll::SDL_PixelFormat } diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs index 4ac4bd83..865f3fe9 100644 --- a/src/sdl2/render.rs +++ b/src/sdl2/render.rs @@ -214,7 +214,7 @@ enum RendererParent { Surface(~surface::Surface), } -#[deriving(Eq)] +#[deriving(Eq)] #[allow(raw_pointer_deriving)] pub struct Renderer { raw: *ll::SDL_Renderer, priv parent: RendererParent, @@ -522,7 +522,7 @@ pub struct TextureQuery { height: int } -#[deriving(Eq)] +#[deriving(Eq)] #[allow(raw_pointer_deriving)] pub struct Texture { raw: *ll::SDL_Texture, owned: bool diff --git a/src/sdl2/surface.rs b/src/sdl2/surface.rs index 955d6b71..2d35c22e 100644 --- a/src/sdl2/surface.rs +++ b/src/sdl2/surface.rs @@ -83,7 +83,7 @@ pub enum SurfaceFlag { DontFree = ll::SDL_DONTFREE as int } -#[deriving(Eq)] +#[deriving(Eq)] #[allow(raw_pointer_deriving)] pub struct Surface { raw: *ll::SDL_Surface, owned: bool diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs index ec8d8fcc..3574269a 100644 --- a/src/sdl2/video.rs +++ b/src/sdl2/video.rs @@ -337,7 +337,7 @@ impl Drop for GLContext { } -#[deriving(Eq)] +#[deriving(Eq)] #[allow(raw_pointer_deriving)] pub struct Window { raw: *ll::SDL_Window, owned: bool