[llvm-branch-commits] [cfe-branch] r127615 - in /cfe/branches/release_29: ./ lib/Sema/SemaDeclCXX.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Mar 14 15:26:07 2011
New Revision: 127615

URL: http://llvm.org/viewvc/llvm-project?rev=127615&view=rev
Log:
--- Merging r127543 into '.':
U    lib/Sema/SemaDeclCXX.cpp


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 15:26:07 2011
@@ -1,2 +1,2 @@
-/cfe/trunk:127460,127541,127563
+/cfe/trunk:127460,127541,127543,127563
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp?rev=127615&r1=127614&r2=127615&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp Mon Mar 14 15:26:07 2011
@@ -1484,7 +1484,10 @@
   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 @@
   return new (Context) CXXCtorInitializer(Context, Loc, LParenLoc, Constructor,
                                           DelegationInit.takeAs<Expr>(),
                                           RParenLoc);
+#endif
 }
 
 MemInitResult

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 15:26:07 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127460,127541,127563
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127460,127541,127543,127563