diff options
| author | Mandeep Singh Grang <mgrang@codeaurora.org> | 2018-03-10 21:13:55 +0000 |
|---|---|---|
| committer | Mandeep Singh Grang <mgrang@codeaurora.org> | 2018-03-10 21:13:55 +0000 |
| commit | 4ccea6230b624387fe265af1fc6a1c9ff2b64e19 (patch) | |
| tree | 5ba651048fe034a07ecc2bedb16165440340c458 | |
| parent | ddba3efda808cc6bca5e369f7ef8ae6a2d8af9d8 (diff) | |
| download | bcm5719-llvm-4ccea6230b624387fe265af1fc6a1c9ff2b64e19.tar.gz bcm5719-llvm-4ccea6230b624387fe265af1fc6a1c9ff2b64e19.zip | |
[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
| -rw-r--r-- | lldb/source/Breakpoint/Breakpoint.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Breakpoint/Breakpoint.cpp b/lldb/source/Breakpoint/Breakpoint.cpp index ace9e832ee8..602b131021f 100644 --- a/lldb/source/Breakpoint/Breakpoint.cpp +++ b/lldb/source/Breakpoint/Breakpoint.cpp @@ -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 = |

