----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://codereview.secondlife.com/r/262/#review626 -----------------------------------------------------------
I tried to compile with your change on Linux (g++ 4.4.5) indra/newview/llfloaterworldmap.cpp <http://codereview.secondlife.com/r/262/#comment595> GCC chokes on the "std::vector<std::pair <U64, LLSimInfo*>>", thinking ">>" is the shift/stream operator. Insert a space to distinguish it from the that: std::vector<std::pair <U64, LLSimInfo*> > sim_info_vec(LLWorldMap::getInstance()->getRegionMap().begin(), LLWorldMap::getInstance()->getRegionMap().end()); indra/newview/llfloaterworldmap.cpp <http://codereview.secondlife.com/r/262/#comment597> Here, I'm getting indra/newview/llfloaterworldmap.cpp: In member function ‘void LLFloaterWorldMap::updateSims(bool)’: indra/newview/llfloaterworldmap.cpp:1498: error: no matching function for call to ‘sort(__gnu_cxx::__normal_iterator<std::pair<long long unsigned int, LLSimInfo*>*, std::vector<std::pair<long long unsigned int, LLSimInfo*>, std::allocator<std::pair<long long unsigned int, LLSimInfo*> > > >, __gnu_cxx::__normal_iterator<std::pair<long long unsigned int, LLSimInfo*>*, std::vector<std::pair<long long unsigned int, LLSimInfo*>, std::allocator<std::pair<long long unsigned int, LLSimInfo*> > > >, LLFloaterWorldMap::updateSims(bool)::SortRegionNames)’ I'm not sure how to fix that. :-\ I tried an #include <algorithm>, but that didn't make this error go away. (But would probably be a good idea anyway.) indra/newview/llfloaterworldmap.cpp <http://codereview.secondlife.com/r/262/#comment596> Here, too, "> >" instead of ">>". - Boroondas On April 15, 2011, 11:33 a.m., Jonathan Yap wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://codereview.secondlife.com/r/262/ > ----------------------------------------------------------- > > (Updated April 15, 2011, 11:33 a.m.) > > > Review request for Viewer. > > > Summary > ------- > > The results of using the World Map search option are sorted. > > > This addresses bug Storm-1128. > http://jira.secondlife.com/browse/Storm-1128 > > > Diffs > ----- > > doc/contributions.txt a8f868007986 > indra/newview/llfloaterworldmap.cpp a8f868007986 > > Diff: http://codereview.secondlife.com/r/262/diff > > > Testing > ------- > > > Thanks, > > Jonathan > >
_______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges