commit 228eea36a3598de7aeed807b00f4d49c1c7e28cc
author Anders Carlsson <andersca@mac.com> Fri Aug 28 15:33:32 2009 +0000
committer Anders Carlsson <andersca@mac.com> Fri Aug 28 15:33:32 2009 +0000
tree 4f74fb4d55bf65d6c1dddc2f4474bdb96b717dcc
parent a1c728438c44ae9727d6bbedc4d1dcfdacb95122

Pass InOverloadResolution all the way down to IsPointerConversion.

llvm-svn: 80368

clang/lib/Sema/Sema.h

diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h
index c592242..52eb89e 100644
--- a/clang/lib/Sema/Sema.h
+++ b/clang/lib/Sema/Sema.h
@@ -727,13 +727,16 @@
   TryImplicitConversion(Expr* From, QualType ToType,
                         bool SuppressUserConversions,
                         bool AllowExplicit,
-                        bool ForceRValue);
-  bool IsStandardConversion(Expr *From, QualType ToType, 
+                        bool ForceRValue,
+                        bool InOverloadResolution);
+  bool IsStandardConversion(Expr *From, QualType ToType,
+                            bool InOverloadResolution,
                             StandardConversionSequence& SCS);
   bool IsIntegralPromotion(Expr *From, QualType FromType, QualType ToType);
   bool IsFloatingPointPromotion(QualType FromType, QualType ToType);
   bool IsComplexPromotion(QualType FromType, QualType ToType);
   bool IsPointerConversion(Expr *From, QualType FromType, QualType ToType,
+                           bool InOverloadResolution,
                            QualType& ConvertedType, bool &IncompatibleObjC);
   bool isObjCPointerConversion(QualType FromType, QualType ToType,
                                QualType& ConvertedType, bool &IncompatibleObjC);