Disable inherited constructors for 2.9.
llvm-svn: 127541
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index f655105..7a597be 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -2898,7 +2898,8 @@
// 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.
- DeclareInheritedConstructors(Record);
+ // Disabled for 2.9
+ //DeclareInheritedConstructors(Record);
}
/// \brief Data used with FindHiddenVirtualMethod
@@ -4324,8 +4325,11 @@
// Constructor inheriting using decls get special treatment.
if (NameInfo.getName().getNameKind() == DeclarationName::CXXConstructorName) {
- if (CheckInheritedConstructorUsingDecl(UD))
- UD->setInvalidDecl();
+ // Disabled for 2.9
+ Diag(UD->getLocation(),
+ diag::err_using_decl_inherited_constructor_unsupported);
+ //if (CheckInheritedConstructorUsingDecl(UD))
+ UD->setInvalidDecl();
return UD;
}