[cfe-commits] r127544 - /cfe/trunk/lib/Sema/SemaDeclCXX.cpp

[Sebastian Redl]

Author: cornedbee
Date: Sat Mar 12 07:53:51 2011
New Revision: 127544

URL: http://llvm.org/viewvc/llvm-project?rev=127544&view=rev
Log:
Revert "Disable delegating constructors for 2.9"
It is only meant for the release branch.

Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=127544&r1=127543&r2=127544&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Sat Mar 12 07:53:51 2011
@@ -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