diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2011-03-12 13:44:32 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2011-03-12 13:44:32 +0000 |
| commit | caa35e4bbfccaaa6c4d69f29b3f1a8b544b3645e (patch) | |
| tree | 0fa5e695348d1fbee5d6b116287fe9557a43d57a /lib/Sema/SemaDeclCXX.cpp | |
| parent | a808c544f9df4d17cb189ba6aa167478cf17ad4a (diff) | |
Revert "Disable inherited constructors for 2.9."
It is only meant for the release branch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127542 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 7a597be871..f6551054c1 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -2898,8 +2898,7 @@ void Sema::CheckCompletedCXXClass(CXXRecordDecl *Record) { // waste space and performance on classes that are not meant to be // instantiated (e.g. meta-functions). This doesn't apply to classes that // have inherited constructors. - // Disabled for 2.9 - //DeclareInheritedConstructors(Record); + DeclareInheritedConstructors(Record); } /// \brief Data used with FindHiddenVirtualMethod @@ -4325,11 +4324,8 @@ NamedDecl *Sema::BuildUsingDeclaration(Scope *S, AccessSpecifier AS, // Constructor inheriting using decls get special treatment. if (NameInfo.getName().getNameKind() == DeclarationName::CXXConstructorName) { - // Disabled for 2.9 - Diag(UD->getLocation(), - diag::err_using_decl_inherited_constructor_unsupported); - //if (CheckInheritedConstructorUsingDecl(UD)) - UD->setInvalidDecl(); + if (CheckInheritedConstructorUsingDecl(UD)) + UD->setInvalidDecl(); return UD; } |