[llvm] r342612 - [unittests] Do not use llvm::sort in googlemock

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Wed Sep 19 21:27:32 2018
New Revision: 342612

URL: http://llvm.org/viewvc/llvm-project?rev=342612&view=rev
Log:
[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

Modified:
    llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h

Modified: llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h?rev=342612&r1=342611&r2=342612&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h (original)
+++ llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h Wed Sep 19 21:27:32 2018
@@ -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()) {