replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[lldb] Unbreak lldb builds due to r327219 

Summary:
r327219 adds wrappers to sort which shuffle the container before sorting.
This causes lldb bots to break as the call to sort is now ambiguous:
http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-buildserver/builds/20725/steps/ninja%20build%20local/logs/stdio

So we need use llvm::sort instead of sort to avoid ambiguity with std::sort.

Note: This patch is just to unbreak the bots. I plan to have subsequent patches which will convert all
calls to std::sort to llvm::sort.

Reviewers: RKSimon, k8stone, jingham, labath, zturner

Subscribers: andreadb, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D44354

llvm-svn: 327224
This commit is contained in:
Mandeep Singh Grang 2018-03-10 21:13:55 +00:00
parent ddba3efda8
commit 4ccea6230b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/source/Breakpoint/Breakpoint.cpp
View File

@ -792,8 +792,8 @@ void Breakpoint::ModuleReplaced(ModuleSP old_module_sp,
// from both maps as we go.
if (old_id_vec.size() == new_id_vec.size()) {
sort(old_id_vec.begin(), old_id_vec.end());
sort(new_id_vec.begin(), new_id_vec.end());
llvm::sort(old_id_vec.begin(), old_id_vec.end());
llvm::sort(new_id_vec.begin(), new_id_vec.end());
size_t num_elements = old_id_vec.size();
for (size_t idx = 0; idx < num_elements; idx++) {
BreakpointLocationSP old_loc_sp =