[cfe-commits] r84662 - /cfe/trunk/lib/Sema/SemaOverload.cpp
Fariborz Jahanian
fjahanian at apple.com
Tue Oct 20 13:07:35 PDT 2009
Author: fjahanian
Date: Tue Oct 20 15:07:35 2009
New Revision: 84662
URL: http://llvm.org/viewvc/llvm-project?rev=84662&view=rev
Log:
Moved comment to its proper place in my last patch.
Modified:
cfe/trunk/lib/Sema/SemaOverload.cpp
Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=84662&r1=84661&r2=84662&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Tue Oct 20 15:07:35 2009
@@ -1934,9 +1934,8 @@
return ImplicitConversionSequence::Worse;
}
}
-
- // conversion of A::* to B::* is better than conversion of A::* to C::*,
-
+
+ // Ranking of member-pointer types.
if (SCS1.Second == ICK_Pointer_Member && SCS2.Second == ICK_Pointer_Member &&
FromType1->isMemberPointerType() && FromType2->isMemberPointerType() &&
ToType1->isMemberPointerType() && ToType2->isMemberPointerType()) {
@@ -1956,6 +1955,7 @@
QualType ToPointee1 = QualType(ToPointeeType1, 0).getUnqualifiedType();
QualType FromPointee2 = QualType(FromPointeeType2, 0).getUnqualifiedType();
QualType ToPointee2 = QualType(ToPointeeType2, 0).getUnqualifiedType();
+ // conversion of A::* to B::* is better than conversion of A::* to C::*,
if (FromPointee1 == FromPointee2 && ToPointee1 != ToPointee2) {
if (IsDerivedFrom(ToPointee1, ToPointee2))
return ImplicitConversionSequence::Worse;
More information about the cfe-commits
mailing list