summaryrefslogtreecommitdiff
path: root/src/guichan/image.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
commit9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch)
treec084bdf8afabc6220779645dcb5dbf71af6a151f /src/guichan/image.cpp
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadmv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/guichan/image.cpp')
-rw-r--r--src/guichan/image.cpp4
1 files changed, 2 insertions, 2 deletions
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.");