From: Sebastian Redl <sebastian.redl@getdesigned.at>
Date: Sat, 12 Mar 2011 13:53:51 +0000 (+0000)
Subject: Revert "Disable delegating constructors for 2.9"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9c32eb0f80f991cbb3fc3e403759f39929f7994;p=clang

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
---

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