diff --git a/src/Trade/AbstractImporter.cpp b/src/Trade/AbstractImporter.cpp index f6b8dd3f8..746131086 100644 --- a/src/Trade/AbstractImporter.cpp +++ b/src/Trade/AbstractImporter.cpp @@ -218,7 +218,13 @@ std::unique_ptr AbstractImporter::object2D(const UnsignedInt id) { return doObject2D(id); } -std::unique_ptr AbstractImporter::doObject2D(UnsignedInt) { return nullptr; } +std::unique_ptr AbstractImporter::doObject2D(UnsignedInt) { + #ifndef CORRADE_GCC45_COMPATIBILITY + return nullptr; + #else + return {}; + #endif +} UnsignedInt AbstractImporter::object3DCount() const { CORRADE_ASSERT(isOpened(), "Trade::AbstractImporter::object3DCount(): no file opened", {}); @@ -248,7 +254,13 @@ std::unique_ptr AbstractImporter::object3D(const UnsignedInt id) { return doObject3D(id); } -std::unique_ptr AbstractImporter::doObject3D(UnsignedInt) { return nullptr; } +std::unique_ptr AbstractImporter::doObject3D(UnsignedInt) { + #ifndef CORRADE_GCC45_COMPATIBILITY + return nullptr; + #else + return {}; + #endif +} UnsignedInt AbstractImporter::mesh2DCount() const { CORRADE_ASSERT(isOpened(), "Trade::AbstractImporter::mesh2DCount(): no file opened", {}); @@ -338,7 +350,13 @@ std::unique_ptr AbstractImporter::material(const UnsignedI return doMaterial(id); } -std::unique_ptr AbstractImporter::doMaterial(UnsignedInt) { return nullptr; } +std::unique_ptr AbstractImporter::doMaterial(UnsignedInt) { + #ifndef CORRADE_GCC45_COMPATIBILITY + return nullptr; + #else + return {}; + #endif +} UnsignedInt AbstractImporter::textureCount() const { CORRADE_ASSERT(isOpened(), "Trade::AbstractImporter::textureCount(): no file opened", {});