Changeset 9144617 in git

Timestamp:

May 19, 2011, 6:04:21 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

1e837f92c02301aebf57bfcaa93a72985cb5bd96

Parents:

7829fbde21af607f5f224dbd5f875555c2ba4736

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-19 06:04:21+02:00

git-committer:

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

Message:

ADD: trying to avoid factory as much as possible (build without...?)

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (1 diff)
• polys/clapconv.h (modified) (2 diffs)
• polys/clapsing.cc (modified) (2 diffs)
• polys/clapsing.h (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -12 +12 @@
 /* for assume: */
 #include <reporter/reporter.h>
+
 #include <coeffs/si_gmp.h>
 
 #ifdef HAVE_FACTORY
-#include <factory/factory.h>
+// #include <factory/factory.h>
+class CanonicalForm;
 #endif
 

libpolys/polys/clapconv.h

@@ -12 +12 @@
 #define INCL_SINGCONV_H
 
+#ifdef HAVE_FACTORY
+
 #include <polys/monomials/ring.h>
 #include <polys/ext_fields/longtrans.h>
-#ifdef HAVE_FACTORY
-#  include <factory/factory.h>
-#endif /* HAVE_FACTORY */
+#include <factory/factory.h>
+
 
 poly convFactoryPSingP ( const CanonicalForm & f, const ring r );
@@ -36 +37 @@
 //poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r );
 
+// HAVE_FACTORY
+#endif 
+
 #endif /* INCL_SINGCONV_H */

libpolys/polys/clapsing.cc

@@ -12 +12 @@
 #include <misc/auxiliary.h>
 
-
-TODO(Martin, Please adapt the following code for the use in SW)
-#ifdef HAVE_FACTORY
-
 #define SI_DONT_HAVE_GLOBAL_VARS
 #include <omalloc/omalloc.h>
@@ -22 +18 @@
 
 // #include <kernel/ffields.h>
-// #include <kernel/clapconv.h>
-// #include <libfac/factor.h>
-
-#include <factory/factory.h>
-
-#include "clapsing.h"
+
 #include "monomials/ring.h"
 #include "simpleideals.h"
 //#include "polys.h"
+
+
+TODO(Martin, Please adapt the following code for the use in SW)
+#ifdef HAVE_FACTORY
+
+#include <factory/factory.h>
+
+#include "clapsing.h"
+#include "clapconv.h"
+// #include <kernel/clapconv.h>
+// #include <libfac/factor.h>
 
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);

libpolys/polys/clapsing.h

@@ -12 +12 @@
 #define INCL_FACTORYSING_H
 
-// #include <kernel/structs.h>
 #include <polys/monomials/p_polys.h>
 #include <polys/monomials/ring.h>