diff options
| author | Dean Michael Berris <dberris@google.com> | 2018-09-20 04:27:32 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2018-09-20 04:27:32 +0000 |
| commit | b569e7e828bb4e89b69e1e1620693a26d8da2dfa (patch) | |
| tree | 26ef8ed18c2fa1f949938cf3c43fdb038e7c279a /llvm/utils/unittest | |
| parent | cae9425a3c4a2af6a306c1aa5c8acfd27136f3fc (diff) | |
| download | bcm5719-llvm-b569e7e828bb4e89b69e1e1620693a26d8da2dfa.tar.gz bcm5719-llvm-b569e7e828bb4e89b69e1e1620693a26d8da2dfa.zip | |
[unittests] Do not use llvm::sort in googlemock
Summary:
This reverts r329475 which applied to googlemock. This change makes the
googlemock implementation in LLVM dependent on LLVM unnecessarily.
Reviewers: echristo, mgrang
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D52287
llvm-svn: 342612
Diffstat (limited to 'llvm/utils/unittest')
| -rw-r--r-- | llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h index 9f001c9e63c..749a30e4e6d 100644 --- a/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h +++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h @@ -2654,7 +2654,7 @@ class WhenSortedByMatcher { LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs); ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(), lhs_stl_container.end()); - ::llvm::sort( + ::std::sort( sorted_container.begin(), sorted_container.end(), comparator_); if (!listener->IsInterested()) { |
