Browse Source

GCC 4.5 compatibility: nullptr-related issues.

Vladimír Vondruš 13 years ago
parent
commit
51f21137df
  1. 4
      src/Test/ImageTest.cpp
  2. 4
      src/Trade/Test/ImageDataTest.cpp

4
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<unsigned char*>(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<unsigned char*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i());
}

4
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<unsigned char*>(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<unsigned char*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i());
}

Loading…
Cancel
Save