commit f9c32eb0f80f991cbb3fc3e403759f39929f7994
author Sebastian Redl <sebastian.redl@getdesigned.at> Sat Mar 12 13:53:51 2011 +0000
committer Sebastian Redl <sebastian.redl@getdesigned.at> Sat Mar 12 13:53:51 2011 +0000
tree 0fa5e695348d1fbee5d6b116287fe9557a43d57a
parent 9d0af360ec510c06967afd7a23b202ce5bad7301

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

lib/Sema/SemaDeclCXX.cpp

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index b6f71d0..f655105 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -1532,10 +1532,7 @@
   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 @@
   return new (Context) CXXCtorInitializer(Context, Loc, LParenLoc, Constructor,
                                           DelegationInit.takeAs<Expr>(),
                                           RParenLoc);
-#endif
 }
 
 MemInitResult