This is an archive of the discontinued LLVM Phabricator instance.

[unittests] Do not use llvm::sort in googlemock
ClosedPublic

Authored by dberris on Sep 19 2018, 7:32 PM.

Reviewers

echristo
mgrang

Commits

Summary

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

LGTM.

This revision was not accepted when it landed; it landed in state Needs Review.Sep 19 2018, 9:28 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

llvm/

trunk/

utils/

unittest/

googlemock/

include/

gmock/

2 lines

Show First 20 Lines • Show All 2,648 Lines • ▼ Show 20 Lines	virtual void DescribeNegationTo(::std::ostream* os) const {
matcher_.DescribeNegationTo(os);		matcher_.DescribeNegationTo(os);
}		}

virtual bool MatchAndExplain(LhsContainer lhs,		virtual bool MatchAndExplain(LhsContainer lhs,
MatchResultListener* listener) const {		MatchResultListener* listener) const {
LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);		LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),		::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),
lhs_stl_container.end());		lhs_stl_container.end());
::llvm::sort(		::std::sort(
sorted_container.begin(), sorted_container.end(), comparator_);		sorted_container.begin(), sorted_container.end(), comparator_);

if (!listener->IsInterested()) {		if (!listener->IsInterested()) {
// If the listener is not interested, we do not need to		// If the listener is not interested, we do not need to
// construct the inner explanation.		// construct the inner explanation.
return matcher_.Matches(sorted_container);		return matcher_.Matches(sorted_container);
}		}

▲ Show 20 Lines • Show All 1,750 Lines • Show Last 20 Lines