fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clover: Fix clover::keys and ::values to deal with r-value references properly.

Browse source 
Returning a reference is incorrect if the specified pair was a
temporary -- Instead of that, use decltype() to deduce the correct
return type qualifiers.  Fixes a crash in clCreateProgramWithBinary().

Reported-and-tested-by: "Dorrington, Albert" <albert.dorrington@lmco.com>
This commit is contained in:
Francisco Jerez 2014-01-14 22:03:57 +01:00
parent 5662602ba0
commit bd62666224
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/state_trackers/clover/util/functional.hpp
View file

@ -289,17 +289,17 @@ namespace clover {
struct keys {
template<typename P>
typename std::remove_reference<P>::type::first_type &
operator()(P &&p) const {
return p.first;
auto
operator()(P &&p) const -> decltype(std::get<0>(std::forward<P>(p))) {
return std::get<0>(std::forward<P>(p));
}
};
struct values {
template<typename P>
typename std::remove_reference<P>::type::second_type &
operator()(P &&p) const {
return p.second;
auto
operator()(P &&p) const -> decltype(std::get<1>(std::forward<P>(p))) {
return std::get<1>(std::forward<P>(p));
}
};