summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaExprCXX.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-08-27 17:37:39 +0000
committerAnders Carlsson <andersca@mac.com>2009-08-27 17:37:39 +0000
commit20d1332d76d4a537812ac48e56468ef584a4eb35 (patch)
tree3048728a062d4e76d2ebb025e0459e4c97530e6a /clang/lib/Sema/SemaExprCXX.cpp
parent271e3a4d472e67ced92eb5972a7ec612686857ec (diff)
downloadbcm5719-llvm-20d1332d76d4a537812ac48e56468ef584a4eb35.tar.gz
bcm5719-llvm-20d1332d76d4a537812ac48e56468ef584a4eb35.zip
Add an InOverloadResolution flag to TryCopyInitialization.
llvm-svn: 80261
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaExprCXX.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 55417c77d65..cdda6ab32ff 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -1238,7 +1238,8 @@ static bool TryClassUnification(Sema &Self, Expr *From, Expr *To,
// standard doesn't say.
ICS = Self.TryCopyInitialization(From, TTy,
/*SuppressUserConversions=*/false,
- /*ForceRValue=*/false);
+ /*ForceRValue=*/false,
+ /*InOverloadResolution=*/false);
}
} else {
// -- Otherwise: E1 can be converted to match E2 if E1 can be
OpenPOWER on IntegriCloud