From 714a6e6ed41afb75e00666d0f7005456d3db2d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 12 Apr 2017 20:27:23 +0200 Subject: [PATCH] Avoid ambiguity when constructing BufferImage. --- src/Magnum/BufferImage.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Magnum/BufferImage.h b/src/Magnum/BufferImage.h index 7226e9f29..5774315d4 100644 --- a/src/Magnum/BufferImage.h +++ b/src/Magnum/BufferImage.h @@ -104,8 +104,9 @@ 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} {} - /* To avoid ambiguous overload when passing Containers::Array */ + /* To avoid ambiguous overload when passing Containers::Array[View] */ template explicit BufferImage(PixelFormat format, PixelType type, const VectorTypeFor& size, const Containers::Array& data, BufferUsage usage): BufferImage{{}, format, type, size, Containers::ArrayView{data}, usage} {} + template explicit BufferImage(PixelFormat format, PixelType type, const VectorTypeFor& size, const Containers::ArrayView& data, BufferUsage usage): BufferImage{{}, format, type, size, Containers::ArrayView{data}, usage} {} #endif #endif