diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-03-03 23:26:56 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-03-03 23:26:56 +0000 |
| commit | a7cb22d27f4440d264f2a1407c43b8d7259d23b0 (patch) | |
| tree | a8a966a7c376b71c65570a2441b016036d3bc16e /lib/Sema/SemaInit.cpp | |
| parent | b29b37d7e5bba50acc3a6642a2c90db080c22b90 (diff) | |
Revert r97674; it's causing failures
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97677 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index bf9f73c961..0f8107ac5e 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -3365,8 +3365,7 @@ InitializationSequence::Perform(Sema &S, // FIXME: Should we move this initialization into a separate // derived-to-base conversion? I believe the answer is "no", because // we don't want to turn off access control here for c-style casts. - if (S.PerformObjectArgumentInitialization(CurInitExpr, /*Qualifier=*/0, - Conversion)) + if (S.PerformObjectArgumentInitialization(CurInitExpr, Conversion)) return S.ExprError(); // Do a little dance to make sure that CurInit has the proper |