From 9e83411f7e4147d09af5a5006888dcc187ea0ef8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 Nov 2011 19:34:52 +0300 Subject: Fix some warnings under gcc 4.7. --- src/guichan/image.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/guichan/image.cpp') diff --git a/src/guichan/image.cpp b/src/guichan/image.cpp index 2c15151a2..837840435 100644 --- a/src/guichan/image.cpp +++ b/src/guichan/image.cpp @@ -55,7 +55,7 @@ namespace gcn { - ImageLoader* Image::mImageLoader = NULL; + ImageLoader* Image::mImageLoader = nullptr; Image::Image() { @@ -78,7 +78,7 @@ namespace gcn Image* Image::load(const std::string& filename, bool convertToDisplayFormat) { - if (mImageLoader == NULL) + if (!mImageLoader) { throw GCN_EXCEPTION("Trying to load an image but " "no image loader is set."); -- cgit v1.2.3-60-g2f50