diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-11-28 21:32:55 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-17 03:20:01 +0100 |
| commit | 92da4e43a39bf567bc102b1dd844ee79ff1c0c61 (patch) | |
| tree | eae7c84c285c4f22c971f7681db7ac18dcfa1e8a /src/3rdparty | |
| parent | 560b95b77ac18edd0954a9b8ce9b92a828b51176 (diff) | |
Delete a disallowed template instantiation the proper way
C++11 allows you to do = delete to the declaration. But some version
of Clang on Mac doesn't like it. I'm guessing it's a compiler bug in
an older version of Clang used in the Qt CI system. I can't reproduce
the issue, so no further investigation was done.
So just remove the "inline" keyword, which is what ICC 14.0 complains
about:
MathExtras.h(270): error #864: extern inline function "clampTo(double, T, T) [with T=long long]" was referenced but not defined
Change-Id: I3887ccb527b5995ffa7ece612f9c7d5a80e71079
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/wtf/MathExtras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/wtf/MathExtras.h b/src/3rdparty/masm/wtf/MathExtras.h index 600a9c7148..5b12157148 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -267,7 +267,7 @@ template<typename T> inline T clampTo(double value, T min = defaultMinimumForCla return min; return static_cast<T>(value); } -template<> inline long long int clampTo(double, long long int, long long int); // clampTo does not support long long ints. +template<> long long int clampTo(double, long long int, long long int); // clampTo does not support long long ints. inline int clampToInteger(double value) { |