From b3f20e41fd5397dea1549830103234c3ec67c508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 8 Sep 2015 09:51:27 +0200 Subject: [PATCH] Passing nullptr data to BufferImage would assert anyway. I can't think of any valid use case, so no problem when these are producing deprecated warnings. --- src/Magnum/BufferImage.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Magnum/BufferImage.h b/src/Magnum/BufferImage.h index b50beb09c..f580709e3 100644 --- a/src/Magnum/BufferImage.h +++ b/src/Magnum/BufferImage.h @@ -85,7 +85,6 @@ template class BufferImage { /* To avoid decay of sized arrays and nullptr to const void* and unwanted use of deprecated function */ template explicit BufferImage(PixelFormat format, PixelType type, const VectorTypeFor& size, const T(&data)[dataSize], BufferUsage usage): BufferImage{{}, format, type, size, Containers::ArrayView{data}, usage} {} - explicit BufferImage(PixelFormat format, PixelType type, const VectorTypeFor& size, std::nullptr_t, BufferUsage usage): BufferImage{{}, format, type, size, Containers::ArrayView{nullptr}, usage} {} #endif #endif @@ -194,9 +193,6 @@ template class BufferImage { template void setData(PixelFormat format, PixelType type, const VectorTypeFor& size, const T(&data)[dataSize], BufferUsage usage) { setData({}, format, type, size, Containers::ArrayView{data}, usage); } - void setData(PixelFormat format, PixelType type, const VectorTypeFor& size, std::nullptr_t, BufferUsage usage) { - setData({}, format, type, size, Containers::ArrayView{nullptr}, usage); - } #endif #endif