Changeset e0d8d1 in git

Timestamp:

Mar 23, 2011, 3:18:18 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

5a3ae8ca16d74d30c86850f9a9454ca5f16a31d7

Parents:

a4081e52fffd1c1c6450f2811d458e9ebc4e2823

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-03-23 15:18:18+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:10+01:00

Message:

fixed prCopy.*

Location:

libpolys/polys

Files:

• Makefile.am (modified) (2 diffs)
• prCopy.cc (modified) (3 diffs)
• prCopyMacros.h (modified) (1 diff)

libpolys/polys/Makefile.am

@@ -14 +14 @@
         operations/pShallowCopyDelete.cc operations/p_Mult_q.cc \
         templates/p_Procs_Lib.cc \
-        polys0.cc prCopy.cc prCopyTemplate.cc \
+        polys0.cc prCopy.cc \
         kbuckets.cc sbuckets.cc templates/p_Procs.cc weight.cc
 
@@ -71 +71 @@
 
 dynamic_modules: ${module_LTLIBRARIES}
+
+prCopy.inc: prCopy.pl
+        perl prCopy.pl > prCopy.xx && mv prCopy.xx prCopy.inc
+
+prCopy.o: prCopy.inc

libpolys/polys/prCopy.cc

@@ -9 +9 @@
 #include "polys/config.h"
 #include <omalloc/omalloc.h>
+#include <polys/monomials/ring.h>
 #include <polys/monomials/p_polys.h>
 #include <coeffs/numbers.h>
-// #include <polys/structs.h>
 #include <polys/monomials/ring.h>
-// #include <polys/ideals.h>
+#include <polys/simpleideals.h>
 // #include <polys/sbuckets.h>
 
@@ -30 +30 @@
 }
 
-// #include <polys/prCopy.inc>
+#include <polys/prCopy.inc>
 
 /////////////////////////////////////////////////////////////////////////
@@ -84 +84 @@
 }
 
-poly prShallowCopyR(poly p, ring r, ring dest_r = currRing)
+poly prShallowCopyR(poly p, ring r, ring dest_r)
 {
   return pr_Copy_NoREqual_NSimple_Sort(p, r, dest_r);

libpolys/polys/prCopyMacros.h

@@ -39 +39 @@
 #define PR_NUMBER_SIMPLE_NAME NSimple
 #else
-#define PR_NCOPY(n, r) n_Copy(n,r)
-#define PR_NDELETE(n, r) n_Delete(n,r)
+#define PR_NCOPY(n, r) n_Copy(n,r->cf)
+#define PR_NDELETE(n, r) n_Delete(n,r->cf)
 #define PR_NUMBER_SIMPLE_NAME NoNSimple
 #endif