From 98dabed4de60bc86522632379f2499aecbae2b70 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 21 Jan 2012 01:26:07 +0300 Subject: Fix compilation errors and warnings for another gcc 4.7 snapshot. --- src/resources/resourcemanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/resources') 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); -- cgit v1.2.3-60-g2f50