From: Douglas Gregor Date: Fri, 16 Apr 2010 17:21:50 +0000 (+0000) Subject: Eliminate the default value for the UserCast parameter of Sema::IsUserDefinedConversi... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=471e2ceb7c441d46823a00a499f855afd19c45c3;p=clang Eliminate the default value for the UserCast parameter of Sema::IsUserDefinedConversion. No functionality change git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101482 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 9c09039877..ea18c3d0b4 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -1093,7 +1093,7 @@ public: OverloadCandidateSet& Conversions, bool AllowConversionFunctions, bool AllowExplicit, bool ForceRValue, - bool UserCast = false); + bool UserCast); bool DiagnoseMultipleUserDefinedConversion(Expr *From, QualType ToType); diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 53e05eed60..88060532d9 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1677,7 +1677,7 @@ Sema::DiagnoseMultipleUserDefinedConversion(Expr *From, QualType ToType) { OverloadCandidateSet CandidateSet(From->getExprLoc()); OverloadingResult OvResult = IsUserDefinedConversion(From, ToType, ICS.UserDefined, - CandidateSet, true, false, false); + CandidateSet, true, false, false, false); if (OvResult == OR_Ambiguous) Diag(From->getSourceRange().getBegin(), diag::err_typecheck_ambiguous_condition)