diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2011-03-12 13:53:51 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2011-03-12 13:53:51 +0000 |
| commit | f9c32eb0f80f991cbb3fc3e403759f39929f7994 (patch) | |
| tree | 0fa5e695348d1fbee5d6b116287fe9557a43d57a /lib/Sema/SemaDeclCXX.cpp | |
| parent | 9d0af360ec510c06967afd7a23b202ce5bad7301 (diff) | |
Revert "Disable delegating constructors for 2.9"
It is only meant for the release branch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127544 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index b6f71d0035..f6551054c1 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -1532,10 +1532,7 @@ Sema::BuildDelegatingInitializer(TypeSourceInfo *TInfo, if (!LangOpts.CPlusPlus0x) return Diag(Loc, diag::err_delegation_0x_only) << TInfo->getTypeLoc().getLocalSourceRange(); - // Disable for 2.9. - return Diag(Loc, diag::err_delegation_unimplemented) - << TInfo->getTypeLoc().getLocalSourceRange(); -#if 0 + // Initialize the object. InitializedEntity DelegationEntity = InitializedEntity::InitializeDelegation( QualType(ClassDecl->getTypeForDecl(), 0)); @@ -1582,7 +1579,6 @@ Sema::BuildDelegatingInitializer(TypeSourceInfo *TInfo, return new (Context) CXXCtorInitializer(Context, Loc, LParenLoc, Constructor, DelegationInit.takeAs<Expr>(), RParenLoc); -#endif } MemInitResult |