Fix gcc 4.9 build errors.
This commit is contained in:
@@ -274,10 +274,10 @@ inline typename T::iterator get_in_vec(T& invec, P pred)
|
||||
template <typename T, typename K>
|
||||
inline typename T::value_type::second_type& get_val_in_pair_vec(T& invec, K key)
|
||||
{
|
||||
auto it = get_in_vec(invec, [&key](T::value_type& e) { return e.first == key; });
|
||||
auto it = get_in_vec(invec, [&key](typename T::value_type& e) { return e.first == key; });
|
||||
if (it == invec.end())
|
||||
{
|
||||
invec.emplace_back(key, T::value_type::second_type());
|
||||
invec.emplace_back(key, typename T::value_type::second_type());
|
||||
return invec.back().second;
|
||||
}
|
||||
return it->second;
|
||||
|
||||
@@ -315,7 +315,6 @@ namespace
|
||||
{
|
||||
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
|
||||
{
|
||||
const LLUUID get_focused_list_id_selected();
|
||||
LLFloaterAvatarList::instance().setFocusAvatar(get_focused_list_id_selected());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -141,6 +141,8 @@ bool handle_go_to();
|
||||
// Export to XML or Collada
|
||||
void handle_export_selected( void * );
|
||||
|
||||
const LLUUID get_focused_list_id_selected();
|
||||
|
||||
class LLViewerMenuHolderGL : public LLMenuHolderGL
|
||||
{
|
||||
public:
|
||||
|
||||
Reference in New Issue
Block a user