[PATCH] D52287: [unittests] Do not use llvm::sort in googlemock

[Dean Michael Berris via Phabricator via llvm-commits]

dberris created this revision.
dberris added reviewers: echristo, mgrang.

This reverts r329475 which applied to googlemock. This change makes the
googlemock implementation in LLVM dependent on LLVM unnecessarily.


https://reviews.llvm.org/D52287

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


Index: llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
===================================================================
--- llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
+++ llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
@@ -2654,7 +2654,7 @@
       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()) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52287.166213.patch
Type: text/x-patch
Size: 681 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180920/34b84bf5/attachment.bin>