Index: llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h =================================================================== --- llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h +++ llvm/trunk/utils/unittest/googlemock/include/gmock/gmock-matchers.h @@ -2654,7 +2654,7 @@ LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs); ::std::vector sorted_container(lhs_stl_container.begin(), lhs_stl_container.end()); - ::llvm::sort( + ::std::sort( sorted_container.begin(), sorted_container.end(), comparator_); if (!listener->IsInterested()) {