Changeset 05fd55 in git

Timestamp:

Sep 20, 2012, 5:27:16 PM (11 years ago)

Author:

Adrian <adi_popescum@…>

Branches:

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

Children:

3feb05488fc45f2659a728850a9c71ad9c0cb838

Parents:

c879eea1669e963fb4c7287a3963abb287d00a49

git-author:

Adrian <adi_popescum@yahoo.de>2012-09-20 17:27:16+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-10-22 11:18:06+02:00

Message:

64bits for Spielweise

Files:

• factory/canonicalform.cc (modified) (1 diff)
• factory/cf_factory.cc (modified) (1 diff)
• factory/int_poly.cc (modified) (2 diffs)
• libpolys/polys/clapconv.cc (modified) (2 diffs)

factory/canonicalform.cc

@@ -1796 +1796 @@
 CanonicalForm::genCoeff( int type, int i )
 {
-    return CanonicalForm( CFFactory::basic( type, i ) );
+    return CanonicalForm( CFFactory::basic( type, (long)i ) );
 }
 

factory/cf_factory.cc

@@ -261 +261 @@
 {
     if ( v.level() == LEVELBASE )
-        return CFFactory::basic( 1 );
+        return CFFactory::basic( 1L );
     else
         return new InternalPoly( v, exp, 1 );

factory/int_poly.cc

@@ -1079 +1079 @@
             else
             {
-                last->next = new term( 0, c, 0 );
+                last->next = new term( 0, c, 0L );
                 last = last->next;
             }
@@ -1309 +1309 @@
           else
             decRefCount(); 
-          return dummy; //is equal to CFFactory::basic (0) in this case
+          return dummy; //is equal to CFFactory::basic ( 0L ) in this case
         }
         if (is_imm(dummy))

libpolys/polys/clapconv.cc

@@ -28 +28 @@
 #include <polys/ext_fields/transext.h>
 
-void out_cf(char *s1,const CanonicalForm &f,char *s2);
+void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 
 static void conv_RecPP ( const CanonicalForm & f, int * exp, sBucket_pt result, ring r );
@@ -105 +105 @@
     pIter( p );
   }
-  return result;
+ return result;
 }