From 82f37b1e9a22e086c036d851b1ed0839f08c11de Mon Sep 17 00:00:00 2001
From: Bill Wendling <isanbard@gmail.com>
Date: Mon, 14 Mar 2011 20:26:07 +0000
Subject: --- Merging r127543 into '.': U    lib/Sema/SemaDeclCXX.cpp

llvm-svn: 127615
---
 clang/lib/Sema/SemaDeclCXX.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 1a12ed8..9ef556e 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1484,7 +1484,10 @@ 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));
@@ -1531,6 +1534,7 @@ Sema::BuildDelegatingInitializer(TypeSourceInfo *TInfo,
   return new (Context) CXXCtorInitializer(Context, Loc, LParenLoc, Constructor,
                                           DelegationInit.takeAs<Expr>(),
                                           RParenLoc);
+#endif
 }
 
 MemInitResult
-- 
cgit v1.1