diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-27 20:47:35 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-27 20:47:35 +0000 |
| commit | d9508869146e8ab1dbc128fa4a832607f737171c (patch) | |
| tree | 5b17496a3b51482e4a18b33f276f2fef8a4e1783 /x11 | |
| parent | d7dcd31f3f206a6f6fc95ee8a07b6f745e5b11d7 (diff) | |
| download | ports-d9508869146e8ab1dbc128fa4a832607f737171c.tar.gz ports-d9508869146e8ab1dbc128fa4a832607f737171c.zip | |
Notes
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs4/files/patch-kjs__wtf__HashSet.h | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/x11/kdelibs4/files/patch-kjs__wtf__HashSet.h b/x11/kdelibs4/files/patch-kjs__wtf__HashSet.h new file mode 100644 index 000000000000..11ea13cf41d6 --- /dev/null +++ b/x11/kdelibs4/files/patch-kjs__wtf__HashSet.h @@ -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> |