From 51f21137dfa655a7f434df1e2897daec3cf17e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 Jan 2014 01:38:06 +0100 Subject: [PATCH] GCC 4.5 compatibility: nullptr-related issues. --- src/Test/ImageTest.cpp | 4 ++-- src/Trade/Test/ImageDataTest.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Test/ImageTest.cpp b/src/Test/ImageTest.cpp index ac65f16f4..120cdc81b 100644 --- a/src/Test/ImageTest.cpp +++ b/src/Test/ImageTest.cpp @@ -75,7 +75,7 @@ void ImageTest::constructMove() { Image2D a(ColorFormat::Red, ColorType::UnsignedByte, {1, 3}, data); Image2D b(std::move(a)); - CORRADE_COMPARE(a.data(), nullptr); + CORRADE_COMPARE(a.data(), static_cast(nullptr)); CORRADE_COMPARE(a.size(), Vector2i()); CORRADE_COMPARE(b.format(), ColorFormat::Red); @@ -134,7 +134,7 @@ void ImageTest::release() { const unsigned char* const pointer = a.release(); CORRADE_COMPARE(pointer, data); - CORRADE_COMPARE(a.data(), nullptr); + CORRADE_COMPARE(a.data(), static_cast(nullptr)); CORRADE_COMPARE(a.size(), Vector2i()); } diff --git a/src/Trade/Test/ImageDataTest.cpp b/src/Trade/Test/ImageDataTest.cpp index 38dec5cd5..3b1751c0c 100644 --- a/src/Trade/Test/ImageDataTest.cpp +++ b/src/Trade/Test/ImageDataTest.cpp @@ -73,7 +73,7 @@ void ImageDataTest::constructMove() { Trade::ImageData2D a(ColorFormat::Red, ColorType::UnsignedByte, {1, 3}, data); Trade::ImageData2D b(std::move(a)); - CORRADE_COMPARE(a.data(), nullptr); + CORRADE_COMPARE(a.data(), static_cast(nullptr)); CORRADE_COMPARE(a.size(), Vector2i()); CORRADE_COMPARE(b.format(), ColorFormat::Red); @@ -120,7 +120,7 @@ void ImageDataTest::release() { const unsigned char* const pointer = a.release(); CORRADE_COMPARE(pointer, data); - CORRADE_COMPARE(a.data(), nullptr); + CORRADE_COMPARE(a.data(), static_cast(nullptr)); CORRADE_COMPARE(a.size(), Vector2i()); }