LGTM. <br><br><div class="gmail_quote"><div dir="ltr">On Wed, Sep 19, 2018, 7:34 PM Dean Michael Berris via Phabricator <<a href="mailto:reviews@reviews.llvm.org">reviews@reviews.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">dberris created this revision.<br>
dberris added reviewers: echristo, mgrang.<br>
<br>
This reverts r329475 which applied to googlemock. This change makes the<br>
googlemock implementation in LLVM dependent on LLVM unnecessarily.<br>
<br>
<br>
<a href="https://reviews.llvm.org/D52287" rel="noreferrer" target="_blank">https://reviews.llvm.org/D52287</a><br>
<br>
Files:<br>
  llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h<br>
<br>
<br>
Index: llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h<br>
===================================================================<br>
--- llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h<br>
+++ llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h<br>
@@ -2654,7 +2654,7 @@<br>
       LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);<br>
       ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),<br>
                                                lhs_stl_container.end());<br>
-      ::llvm::sort(<br>
+      ::std::sort(<br>
            sorted_container.begin(), sorted_container.end(), comparator_);<br>
<br>
       if (!listener->IsInterested()) {<br>
<br>
<br>
</blockquote></div>