kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build with clang 3.1.

Browse source 
Add the fix I committed upstream to fix the build with clang 3.1,
originally reported by arrowdodger on #kde-freebsd.

No PORTREVISION bump, as there have been no dependency changes and the
build has been fixed only for people who had never been able to build
it before.
This commit is contained in:
Raphael Kubo da Costa 2012-05-27 20:47:35 +00:00
parent d7dcd31f3f
commit d950886914
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=297561
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
x11/kdelibs4/files/patch-kjs__wtf__HashSet.h Normal file
View file

@ -0,0 +1,42 @@
commit a8ae408985e3eadee91ce95b584e768a205fec02
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun May 27 17:10:27 2012 -0300
Fix the build with clang 3.1 (and possibly ICC).
Use the `template' keyword to disambiguate the calls here. Similar to
what was done in WebKit's WTF revision 37062.
Reviewed-by: SadEagle on IRC
diff --git a/kjs/wtf/HashSet.h b/kjs/wtf/HashSet.h
index a1519d5..88ddf79 100644
--- ./kjs/wtf/HashSet.h
+++ ./kjs/wtf/HashSet.h
@@ -181,7 +181,7 @@ namespace WTF {
inline HashSet<Value, HashFunctions, Traits>::find(const T& value)
{
typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
- return m_impl.find<T, Adapter>(value);
+ return m_impl.template find<T, Adapter>(value);
}
template<typename Value, typename HashFunctions, typename Traits>
@@ -190,7 +190,7 @@ namespace WTF {
inline HashSet<Value, HashFunctions, Traits>::find(const T& value) const
{
typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
- return m_impl.find<T, Adapter>(value);
+ return m_impl.template find<T, Adapter>(value);
}
template<typename Value, typename HashFunctions, typename Traits>
@@ -198,7 +198,7 @@ namespace WTF {
inline bool HashSet<Value, HashFunctions, Traits>::contains(const T& value) const
{
typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
- return m_impl.contains<T, Adapter>(value);
+ return m_impl.template contains<T, Adapter>(value);
}
template<typename T, typename U, typename V>