Merge pull request #69 from jcowgill/fix-conversion-null

LaurentGomila · LaurentGomila · commit 57d3ee0d8973 · 2015-03-04T18:45:04.000+01:00
Fix pointer conversion warning when compiling without NDEBUG on Linux
diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp
@@ -317,7 +317,7 @@ void sfWindow_setJoystickThreshold(sfWindow* window, float threshold)
 ////////////////////////////////////////////////////////////
 sfWindowHandle sfWindow_getSystemHandle(const sfWindow* window)
 {
-    CSFML_CHECK_RETURN(window, NULL);
+    CSFML_CHECK_RETURN(window, 0);
 
     return (sfWindowHandle)window->This.getSystemHandle();
 }

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ void sfWindow_setJoystickThreshold(sfWindow* window, float threshold)`
`317`	`317`	`////////////////////////////////////////////////////////////`
`318`	`318`	`sfWindowHandle sfWindow_getSystemHandle(const sfWindow* window)`
`319`	`319`	`{`
`320`		`- CSFML_CHECK_RETURN(window, NULL);`
	`320`	`+ CSFML_CHECK_RETURN(window, 0);`
`321`	`321`
`322`	`322`	`return (sfWindowHandle)window->This.getSystemHandle();`
`323`	`323`	`}`