From 3f891cfa7c0471961f9821a9cf7389acc3c98e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 25 Apr 2013 23:24:00 +0200 Subject: [PATCH] Removed unneeded `extern class`, added export macros to proper place. Leftover from c4f321d91120a9cbd9269a0cf6e542447f4dd3f9, don't know at all why and how that happen. --- src/BufferImage.cpp | 6 +++--- src/Image.cpp | 6 +++--- src/Image.h | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/BufferImage.cpp b/src/BufferImage.cpp index db8d13069..b29c10e43 100644 --- a/src/BufferImage.cpp +++ b/src/BufferImage.cpp @@ -34,9 +34,9 @@ template void BufferImage::setData(const typ _buffer.setData(pixelSize(format, type)*size.product(), data, usage); } -template class BufferImage<1>; -template class BufferImage<2>; -template class BufferImage<3>; +template class MAGNUM_EXPORT BufferImage<1>; +template class MAGNUM_EXPORT BufferImage<2>; +template class MAGNUM_EXPORT BufferImage<3>; #endif } diff --git a/src/Image.cpp b/src/Image.cpp index a1c67a30a..92f740b5c 100644 --- a/src/Image.cpp +++ b/src/Image.cpp @@ -34,8 +34,8 @@ template void Image::setData(const typename _data = reinterpret_cast(data); } -template class Image<1>; -template class Image<2>; -template class Image<3>; +template class MAGNUM_EXPORT Image<1>; +template class MAGNUM_EXPORT Image<2>; +template class MAGNUM_EXPORT Image<3>; } diff --git a/src/Image.h b/src/Image.h index f0de0ad67..8c1649b9d 100644 --- a/src/Image.h +++ b/src/Image.h @@ -94,12 +94,6 @@ template class Image: public AbstractImage { unsigned char* _data; }; -#ifndef DOXYGEN_GENERATING_OUTPUT -extern template class MAGNUM_EXPORT Image<1>; -extern template class MAGNUM_EXPORT Image<2>; -extern template class MAGNUM_EXPORT Image<3>; -#endif - /** @brief One-dimensional image */ typedef Image<1> Image1D;