Changeset c6e80e in git for kernel/kstd1.cc

Timestamp:

Jul 19, 2011, 5:39:14 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f478f5beee78cd910479115b993cc9e7b02b82a8

Parents:

a2174ab573b7b58a5ee6a6c293035fc8ecbd45ab

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-19 17:39:14+02:00

git-committer:

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

Message:

FIX: kInline.cc should be a header: kInline.h
ADD: nGcd/pDeg can be used with and without ring argument

File:

• kernel/kstd1.cc (modified) (5 diffs)

kernel/kstd1.cc

@@ -15 +15 @@
 #define MORA_USE_BUCKETS
 
-#include <kernel/mod2.h>
-#include <omalloc/omalloc.h>
-
 #ifndef NDEBUG
 # define MYTEST 0
@@ -24 +21 @@
 #endif /* ifndef NDEBUG */
 
+
+#include "mod2.h"
+
+#include <omalloc/omalloc.h>
+#include <misc/options.h>
+#include <misc/intvec.h>
+
 #if MYTEST
 #ifdef HAVE_TAIL_RING
@@ -30 +34 @@
 #endif /* if MYTEST */
 
-#include <misc/options.h>
+#include <polys/weight.h>
+#include <polys/polys.h>
+
 #include <kernel/kutil.h>
-#include <kernel/kInline.cc>
-#include <polys/polys.h>
 #include <kernel/febase.h>
 #include <kernel/kstd1.h>
 #include <kernel/khstd.h>
 #include <kernel/stairc.h>
-#include <polys/weight.h>
 //#include "cntrlc.h"
-#include <misc/intvec.h>
 #include <kernel/ideals.h>
 //#include "../Singular/ipid.h"
@@ -48 +50 @@
 
 #ifdef HAVE_PLURAL
+#include <polys/nc/nc.h>
 #include <polys/nc/sca.h>
 #endif
+
+#include <kernel/kInline.h>
 
 
@@ -1690 +1695 @@
 long kModDeg(poly p, ring r)
 {
-  long o=pWDegree(p, r);
+  long o=p_WDegree(p, r);
   long i=p_GetComp(p, r);
   if (i==0) return o;