diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
| commit | 98dabed4de60bc86522632379f2499aecbae2b70 (patch) | |
| tree | 48924b90447eb513f330c1e82d9afbab3719525e /src/resources/resourcemanager.cpp | |
| parent | ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff) | |
| download | manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2 manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz manaplus-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.cpp | 2 |
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); |