Remove the Q_STATIC_TEMPLATE_SPECIALIZATION macro
This was necessary only for older MS Visual Studio versions, which are no longer supported anyway. Change-Id: I6c96fb2340296c34b480716303c93b892419229b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
parent
d3951a5b0f
commit
38f33e035f
@ -814,7 +814,6 @@ template<TextureBlendType blendType>
|
||||
void fetchTransformedBilinear_pixelBounds(int max, int l1, int l2, int &v1, int &v2);
|
||||
|
||||
template<>
|
||||
Q_STATIC_TEMPLATE_SPECIALIZATION
|
||||
inline void fetchTransformedBilinear_pixelBounds<BlendTransformedBilinearTiled>(int max, int, int, int &v1, int &v2)
|
||||
{
|
||||
v1 %= max;
|
||||
@ -828,7 +827,6 @@ inline void fetchTransformedBilinear_pixelBounds<BlendTransformedBilinearTiled>(
|
||||
}
|
||||
|
||||
template<>
|
||||
Q_STATIC_TEMPLATE_SPECIALIZATION
|
||||
inline void fetchTransformedBilinear_pixelBounds<BlendTransformedBilinear>(int, int l1, int l2, int &v1, int &v2)
|
||||
{
|
||||
if (v1 < l1)
|
||||
|
@ -67,12 +67,6 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
#if defined(Q_CC_MSVC) && _MSCVER <= 1300 && !defined(Q_CC_INTEL)
|
||||
#define Q_STATIC_TEMPLATE_SPECIALIZATION static
|
||||
#else
|
||||
#define Q_STATIC_TEMPLATE_SPECIALIZATION
|
||||
#endif
|
||||
|
||||
#if defined(Q_CC_RVCT)
|
||||
// RVCT doesn't like static template functions
|
||||
# define Q_STATIC_TEMPLATE_FUNCTION
|
||||
|
@ -423,7 +423,6 @@ inline void qt_memrotate270_template(const T *src, int srcWidth, int srcHeight,
|
||||
}
|
||||
|
||||
template <>
|
||||
Q_STATIC_TEMPLATE_SPECIALIZATION
|
||||
inline void qt_memrotate90_template<quint24>(const quint24 *src, int srcWidth, int srcHeight,
|
||||
int srcStride, quint24 *dest, int dstStride)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user