diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-12-14 20:57:13 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-12-14 20:57:13 +0000 |
commit | a6ca65075490a1f217bbe5f83fe7b80e821df2d8 (patch) | |
tree | 8bb019267d9f1482c53c67255c8cc86b501516fb /lib/Sema/SemaInit.cpp | |
parent | 96a063a70ca6374c401642c2a88ec1f11697b7ae (diff) |
Minor cleanups for constructor initialization in InitializationSequence
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91325 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
-rw-r--r-- | lib/Sema/SemaInit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 785e40b165..c7994a06c3 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -2474,7 +2474,7 @@ static void TryConstructorInitialization(Sema &S, const InitializationKind &Kind, Expr **Args, unsigned NumArgs, InitializationSequence &Sequence) { - Sequence.setSequenceKind(InitializationSequence::ConstructorConversion); + Sequence.setSequenceKind(InitializationSequence::ConstructorInitialization); // Build the candidate set directly in the initialization sequence // structure, so that it will persist if we fail. @@ -2885,7 +2885,7 @@ InitializationSequence::Perform(Sema &S, // we're supposed to start the conversion from the solitary initializer or // from the set of arguments. if (Kind.getKind() == InitializationKind::IK_Copy || - SequenceKind == ReferenceBinding) { + SequenceKind != ConstructorInitialization) { assert(Args.size() == 1); CurInit = Sema::OwningExprResult(S, Args.release()[0]); if (CurInit.isInvalid()) |