summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-21 01:26:07 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-21 01:26:07 +0300
commit98dabed4de60bc86522632379f2499aecbae2b70 (patch)
tree48924b90447eb513f330c1e82d9afbab3719525e /src/resources/resourcemanager.cpp
parentec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff)
downloadplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz
plus-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2
plus-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz
plus-98dabed4de60bc86522632379f2499aecbae2b70.zip
Fix compilation errors and warnings for another gcc 4.7 snapshot.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 06818705c..3376394bc 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -456,7 +456,7 @@ struct DyedImageLoader
if (!buffer)
{
delete d;
- return 0;
+ return nullptr;
}
Resource *res = d ? Image::load(buffer, fileSize, *d)
: Image::load(buffer, fileSize);