Attachment #328354 for bug #441778

View | Details | Raw Unified | Return to bug 441778
Collapse All | Expand All

Lines 359-366 GetBestOverloadCandidateSimple( Link Here

(-)a/tools/clang/lib/AST/DeclCXX.cpp (-2 / +2 lines)
359	if (Cands[Best].second.compatiblyIncludes(Cands[I].second))	359	if (Cands[Best].second.compatiblyIncludes(Cands[I].second))
360	Best = I;	360	Best = I;
361		361
362	for (unsigned I = 1; I != N; ++I)	362	for (unsigned I = 0; I != N; ++I)
363	if (Cands[Best].second.compatiblyIncludes(Cands[I].second))	363	if (I != Best && Cands[Best].second.compatiblyIncludes(Cands[I].second))
364	return 0;	364	return 0;
365		365
366	return Cands[Best].first;	366	return Cands[Best].first;

Lines 9213-9222 void Sema::DiagnoseNontrivial(const RecordType* T, CXXSpecialMember member) { Link Here

(-)a/tools/clang/lib/Sema/SemaDecl.cpp (-5 / +3 lines)
9213		9213
9214	case CXXCopyAssignment:	9214	case CXXCopyAssignment:
9215	if (RD->hasUserDeclaredCopyAssignment()) {	9215	if (RD->hasUserDeclaredCopyAssignment()) {
9216	// FIXME: this should use the location of the copy	9216	SourceLocation AssignLoc =
9217	// assignment, not the type.	9217	RD->getCopyAssignmentOperator(0)->getLocation();
9218	SourceLocation TyLoc = RD->getLocStart();	9218	Diag(AssignLoc, diag::note_nontrivial_user_defined) << QT << member;
9219	Diag(TyLoc, diag::note_nontrivial_user_defined) << QT << member;
9220	return;	9219	return;
9221	}	9220	}
9222	break;	9221	break;
9223	-

Return to bug 441778