diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-08-27 17:18:13 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-08-27 17:18:13 +0000 |
| commit | 03068aa0777d7ab13863cc1892dd18fa4feef506 (patch) | |
| tree | 7a709ada2678c51120f07433a2b871f6c426241c /clang/lib/Sema/SemaOverload.cpp | |
| parent | 5ec4abf2684ddef0b50fbc6fde3d579f3ad8faba (diff) | |
| download | bcm5719-llvm-03068aa0777d7ab13863cc1892dd18fa4feef506.tar.gz bcm5719-llvm-03068aa0777d7ab13863cc1892dd18fa4feef506.zip | |
Remove default argument from TryCopyInitialization.
llvm-svn: 80256
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index dde5c287236..52010ab5145 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -2430,7 +2430,11 @@ Sema::AddConversionCandidate(CXXConversionDecl *Conversion, CallExpr Call(Context, &ConversionFn, 0, 0, Conversion->getConversionType().getNonReferenceType(), SourceLocation()); - ImplicitConversionSequence ICS = TryCopyInitialization(&Call, ToType, true); + ImplicitConversionSequence ICS = + TryCopyInitialization(&Call, ToType, + /*SuppressUserConversions=*/true, + /*ForceRValue=*/false); + switch (ICS.ConversionKind) { case ImplicitConversionSequence::StandardConversion: Candidate.FinalConversion = ICS.Standard; @@ -2543,7 +2547,8 @@ void Sema::AddSurrogateCandidate(CXXConversionDecl *Conversion, QualType ParamType = Proto->getArgType(ArgIdx); Candidate.Conversions[ArgIdx + 1] = TryCopyInitialization(Args[ArgIdx], ParamType, - /*SuppressUserConversions=*/false); + /*SuppressUserConversions=*/false, + /*ForceRValue=*/false); if (Candidate.Conversions[ArgIdx + 1].ConversionKind == ImplicitConversionSequence::BadConversion) { Candidate.Viable = false; @@ -2674,7 +2679,8 @@ void Sema::AddBuiltinCandidate(QualType ResultTy, QualType *ParamTys, } else { Candidate.Conversions[ArgIdx] = TryCopyInitialization(Args[ArgIdx], ParamTys[ArgIdx], - ArgIdx == 0 && IsAssignmentOperator); + ArgIdx == 0 && IsAssignmentOperator, + /*ForceRValue=*/false); } if (Candidate.Conversions[ArgIdx].ConversionKind == ImplicitConversionSequence::BadConversion) { |
