Revert "Sema: Make derived conformances work from extensions"

Speculatively revert; this looks like it is breaking the iOS bots.

Swift SVN r28963
This commit is contained in:
Ted Kremenek
2015-05-23 15:26:55 +00:00
parent 9917e74533
commit a575727a2b
18 changed files with 163 additions and 321 deletions

View File

@@ -38,7 +38,6 @@ namespace swift {
class CanType;
class Decl;
class DeclContext;
class EnumDecl;
class ExtensionDecl;
class Expr;
class GenericParamList;
@@ -245,10 +244,6 @@ public:
/// ClassDecl, otherwise return null.
ClassDecl *isClassOrClassExtensionContext() const;
/// If this DeclContext is a enum, or an extension on a enum, return the
/// EnumDecl, otherwise return null.
EnumDecl *isEnumOrEnumExtensionContext() const;
/// If this DeclContext is a protocol, or an extension on a
/// protocol, return the ProtocolDecl, otherwise return null.
ProtocolDecl *isProtocolOrProtocolExtensionContext() const;