From bbbe99b786944bde374ddf436591ca838e93808e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 23 May 2015 15:35:06 +0200 Subject: [PATCH] Audio, Trade: fixed compilation with GCC 5.1. Huh. --- src/Magnum/Audio/AbstractImporter.cpp | 2 +- src/Magnum/Trade/AbstractImporter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp index 1acb1126d..eef56d76f 100644 --- a/src/Magnum/Audio/AbstractImporter.cpp +++ b/src/Magnum/Audio/AbstractImporter.cpp @@ -37,7 +37,7 @@ AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std: bool AbstractImporter::openData(Containers::ArrayReference data) { CORRADE_ASSERT(features() & Feature::OpenData, - "Audio::AbstractImporter::openData(): feature not supported", nullptr); + "Audio::AbstractImporter::openData(): feature not supported", {}); close(); doOpenData(data); diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp index fabc0902f..6925a7646 100644 --- a/src/Magnum/Trade/AbstractImporter.cpp +++ b/src/Magnum/Trade/AbstractImporter.cpp @@ -51,7 +51,7 @@ AbstractImporter::AbstractImporter(PluginManager::AbstractManager& manager, std: bool AbstractImporter::openData(Containers::ArrayReference data) { CORRADE_ASSERT(features() & Feature::OpenData, - "Trade::AbstractImporter::openData(): feature not supported", nullptr); + "Trade::AbstractImporter::openData(): feature not supported", {}); close(); doOpenData(data);