fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 08:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clover: Workaround compiler bug present in GCC 4.7.0-4.7.2.

Browse source 
Variadic template aliases make these versions of GCC very confused,
write down the full type spec instead.
This commit is contained in:
Francisco Jerez 2013-10-30 11:11:06 -07:00
parent 0a2bdbb76f
commit 6e9206bdcc
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gallium/state_trackers/clover/util/range.hpp
View file

@ -218,14 +218,6 @@ namespace clover {
namespace detail {
template<typename T>
using preferred_iterator_type = decltype(std::declval<T>().begin());
template<typename F, typename... Os>
using adaptor_iterator = detail::iterator_adaptor<
F, preferred_iterator_type<Os>...>;
template<typename F, typename... Os>
using adaptor_const_iterator = detail::iterator_adaptor<
F, preferred_iterator_type<const Os>...>;
}
///
@ -236,12 +228,17 @@ namespace clover {
template<typename F, typename... Os>
class adaptor_range :
public detail::basic_range<adaptor_range<F, Os...>,
detail::adaptor_iterator<F, Os...>,
detail::adaptor_const_iterator<F, Os...>> {
detail::iterator_adaptor<
F, detail::preferred_iterator_type<Os>...>,
detail::iterator_adaptor<
F, detail::preferred_iterator_type<const Os>...>
> {
public:
typedef detail::basic_range<adaptor_range<F, Os...>,
detail::adaptor_iterator<F, Os...>,
detail::adaptor_const_iterator<F, Os...>
detail::iterator_adaptor<
F, detail::preferred_iterator_type<Os>...>,
detail::iterator_adaptor<
F, detail::preferred_iterator_type<const Os>...>
> super;
template<typename G, typename... Rs>
@ -254,23 +251,23 @@ namespace clover {
return f == r.f && os == r.os;
}
detail::adaptor_iterator<F, Os...>
typename super::iterator
begin() {
return { f, tuple::map(begins(), os) };
}
detail::adaptor_iterator<F, Os...>
typename super::iterator
end() {
return { f, tuple::map(advances_by(size()),
tuple::map(begins(), os)) };
}
detail::adaptor_const_iterator<F, Os...>
typename super::const_iterator
begin() const {
return { f, tuple::map(begins(), os) };
}
detail::adaptor_const_iterator<F, Os...>
typename super::const_iterator
end() const {
return { f, tuple::map(ends(), os) };
}