diff options
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaInit.h | 2 |
2 files changed, 3 insertions, 3 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()) diff --git a/lib/Sema/SemaInit.h b/lib/Sema/SemaInit.h index 7f28baa9bd..2c05196fb1 100644 --- a/lib/Sema/SemaInit.h +++ b/lib/Sema/SemaInit.h @@ -307,7 +307,7 @@ public: UserDefinedConversion, /// \brief A constructor call. - ConstructorConversion, + ConstructorInitialization, /// \brief A reference binding. ReferenceBinding, |