Skip to content

Commit

Permalink
[unittests] Do not use llvm::sort in googlemock
Browse files Browse the repository at this point in the history
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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342612 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
deanberris committed Sep 20, 2018
1 parent 5dd1dd3 commit 6bf5f37
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion utils/unittest/googlemock/include/gmock/gmock-matchers.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down

0 comments on commit 6bf5f37

Please sign in to comment.