From b569e7e828bb4e89b69e1e1620693a26d8da2dfa Mon Sep 17 00:00:00 2001
From: Dean Michael Berris <dberris@google.com>
Date: Thu, 20 Sep 2018 04:27:32 +0000
Subject: [PATCH] [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
---
 llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
index 9f001c9e63c6..749a30e4e6d8 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()) {