Skip to content

Commit

Permalink
[lldb] Unbreak lldb builds due to r327219
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Mandeep Singh Grang committed Mar 10, 2018
1 parent ddba3ef commit 4ccea62
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lldb/source/Breakpoint/Breakpoint.cpp
Expand Up @@ -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 =
Expand Down

0 comments on commit 4ccea62

Please sign in to comment.