Changeset d83c0b in git

Timestamp:

Sep 11, 2013, 3:20:39 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

142afdb13c43074bd1d8e25bc17989486e397819

Parents:

babf57a175c3a59ac32f2f47682bb203ad3ed696

git-author:

Martin Lee <martinlee84@web.de>2013-09-11 15:20:39+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-09-11 15:31:05+02:00

Message:

fix: memory leak
deleted unnecessary stuff using NTL in non-word size case

File:

• factory/cf_gcd.cc (modified) (3 diffs)

factory/cf_gcd.cc

@@ -342 +342 @@
     {
       fac_NTL_char=getCharacteristic();
-      #ifdef NTL_ZZ
-      ZZ r;
-      r=getCharacteristic();
-      ZZ_pContext ccc(r);
-      #else
-      zz_pContext ccc(getCharacteristic());
-      #endif
-      ccc.restore();
-      #ifdef NTL_ZZ
-      ZZ_p::init(r);
-      #else
       zz_p::init(getCharacteristic());
-      #endif
-    }
-    #ifdef NTL_ZZ
-    ZZ_pX F1=convertFacCF2NTLZZpX(f);
-    ZZ_pX G1=convertFacCF2NTLZZpX(g);
-    ZZ_pX R;
-    ZZ_pX A,B;
-    XGCD(R,A,B,F1,G1);
-    a=convertNTLZZpX2CF(A,f.mvar());
-    b=convertNTLZZpX2CF(B,f.mvar());
-    return convertNTLZZpX2CF(R,f.mvar());
-    #else
+    }
     zz_pX F1=convertFacCF2NTLzzpX(f);
     zz_pX G1=convertFacCF2NTLzzpX(g);
@@ -374 +352 @@
     b=convertNTLzzpX2CF(B,f.mvar());
     return convertNTLzzpX2CF(R,f.mvar());
-    #endif
   }
 #endif
@@ -1128 +1105 @@
   {
     fac_NTL_char=getCharacteristic();
-    #ifdef NTL_ZZ
-    ZZ r;
-    r=getCharacteristic();
-    ZZ_pContext ccc(r);
-    #else
-    zz_pContext ccc(getCharacteristic());
-    #endif
-    ccc.restore();
-    #ifdef NTL_ZZ
-    ZZ_p::init(r);
-    #else
     zz_p::init(getCharacteristic());
-    #endif
-  }
-  #ifdef NTL_ZZ
-  ZZ_pX F1=convertFacCF2NTLZZpX(F);
-  ZZ_pX G1=convertFacCF2NTLZZpX(G);
-  ZZ_pX R=GCD(F1,G1);
-  return  convertNTLZZpX2CF(R,F.mvar());
-  #else
+  }
   zz_pX F1=convertFacCF2NTLzzpX(F);
   zz_pX G1=convertFacCF2NTLzzpX(G);
   zz_pX R=GCD(F1,G1);
   return  convertNTLzzpX2CF(R,F.mvar());
-  #endif
 }
 #endif