diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-03-14 20:26:07 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-03-14 20:26:07 +0000 |
| commit | 82f37b1e9a22e086c036d851b1ed0839f08c11de (patch) | |
| tree | 9162766a20467296df334a0784a843e5300e7d04 | |
| parent | d86b9d634865606f4bb8cae96a17aa8593d903ea (diff) | |
| download | llvm-82f37b1e9a22e086c036d851b1ed0839f08c11de.zip llvm-82f37b1e9a22e086c036d851b1ed0839f08c11de.tar.gz llvm-82f37b1e9a22e086c036d851b1ed0839f08c11de.tar.bz2 | |
--- Merging r127543 into '.':
U lib/Sema/SemaDeclCXX.cpp
llvm-svn: 127615
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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 |