1 files changed, 7 insertions, 3 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index f6551054c1..7a597be871 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -2898,7 +2898,8 @@ 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.
-  DeclareInheritedConstructors(Record);
+  // Disabled for 2.9
+  //DeclareInheritedConstructors(Record);
 }
 
 /// \brief Data used with FindHiddenVirtualMethod
@@ -4324,8 +4325,11 @@ NamedDecl *Sema::BuildUsingDeclaration(Scope *S, AccessSpecifier AS,
 
   // 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;
   }