Merge pull request #2209 from yebblies/killif

[DDMD] Remove some dead code and cutting #ifs
dlang · Jun 18, 2013 · 2f29896 · 2f29896
2 parents b5aa808 + 70f1816
commit 2f29896
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -633,7 +633,6 @@ Expression *resolveUFCS(Scope *sc, CallExp *ce)
              * It is necessary in: e.init()
              */
         }
-#if 1
         else if (t->ty == Taarray)
         {
             if (ident == Id::remove)
@@ -675,7 +674,6 @@ Expression *resolveUFCS(Scope *sc, CallExp *ce)
                     return NULL;
             }
         }
-#endif
         else
         {
             if (Expression *ey = die->semanticY(sc, 1))

diff --git a/src/mtype.c b/src/mtype.c
@@ -5062,12 +5062,7 @@ int Type::covariant(Type *t, StorageClass *pstc)
 
             if (!arg1->type->equals(arg2->type))
             {
-#if 0 // turn on this for contravariant argument types, see bugzilla 3075
-                // BUG: cannot convert ref to const to ref to immutable
-                // We can add const, but not subtract it
-                if (arg2->type->implicitConvTo(arg1->type) < MATCHconst)
-#endif
-                    goto Ldistinct;
+                goto Ldistinct;
             }
             const StorageClass sc = STCref | STCin | STCout | STClazy;
             if ((arg1->storageClass & sc) != (arg2->storageClass & sc))
@@ -5115,11 +5110,7 @@ int Type::covariant(Type *t, StorageClass *pstc)
         ClassDeclaration *cd = ((TypeClass *)t1n)->sym;
 //        if (cd->scope)
 //            cd->semantic(NULL);
-#if 0
-        if (!cd->baseClass && cd->baseclasses->dim && !cd->isInterfaceDeclaration())
-#else
         if (!cd->isBaseInfoComplete())
-#endif
         {
             return 3;   // forward references
         }