Context Navigation

← Previous Changeset
Next Changeset →

Changeset 52e6ef in git

Timestamp:

Aug 5, 2016, 2:37:30 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

9bb030cfb7c6f2a87d89031305421baf5e7a6dbc

Parents:

f5ec00a55ff7271253ab3a87defe94cc73d18291

Message:

chg: use misc/auxiliary.h in libpolys and kernel/mod2.h in Singular for config

Files:

: 59 edited

Singular/blackbox.cc (modified) (1 diff)
Singular/blackbox.h (modified) (1 diff)
Singular/cntrlc.h (modified) (1 diff)
Singular/dyn_modules/singmathic/singmathic.cc (modified) (1 diff)
Singular/extra.cc (modified) (1 diff)
Singular/fglm.h (modified) (1 diff)
Singular/gms.h (modified) (1 diff)
Singular/grammar.cc (modified) (1 diff)
Singular/grammar.y (modified) (1 diff)
Singular/ipassign.cc (modified) (1 diff)
Singular/ipshell.cc (modified) (1 diff)
Singular/libsingular.h (modified) (1 diff)
Singular/links/silink.h (modified) (1 diff)
Singular/maps_ip.h (modified) (1 diff)
Singular/misc_ip.cc (modified) (1 diff)
Singular/misc_ip.h (modified) (1 diff)
Singular/number2.h (modified) (1 diff)
Singular/test.cc (modified) (1 diff)
Singular/tesths.cc (modified) (1 diff)
kernel/GBEngine/kpolys.cc (modified) (1 diff)
kernel/GBEngine/nc.cc (modified) (1 diff)
kernel/GBEngine/nc.h (modified) (2 diffs)
kernel/GBEngine/sca.cc (modified) (1 diff)
kernel/GBEngine/test.cc (modified) (1 diff)
kernel/combinatorics/hilb.cc (modified) (1 diff)
kernel/combinatorics/test.cc (modified) (1 diff)
kernel/fglm/test.cc (modified) (1 diff)
kernel/groebner_walk/test.cc (modified) (1 diff)
kernel/linear_algebra/test.cc (modified) (1 diff)
kernel/maps/test.cc (modified) (1 diff)
kernel/numeric/mpr_base.cc (modified) (1 diff)
kernel/numeric/mpr_inout.cc (modified) (1 diff)
kernel/numeric/mpr_numeric.cc (modified) (1 diff)
kernel/numeric/test.cc (modified) (1 diff)
kernel/oswrapper/test.cc (modified) (1 diff)
kernel/polys.cc (modified) (1 diff)
kernel/preimage.cc (modified) (1 diff)
kernel/spectrum/test.cc (modified) (1 diff)
kernel/structs.h (modified) (2 diffs)
kernel/test.cc (modified) (1 diff)
libpolys/coeffs/AEp.h (modified) (1 diff)
libpolys/coeffs/coeffs.h (modified) (1 diff)
libpolys/coeffs/flintcf_Q.cc (modified) (1 diff)
libpolys/coeffs/flintcf_Zn.cc (modified) (1 diff)
libpolys/coeffs/flintcf_Zn.h (modified) (1 diff)
libpolys/coeffs/gnumpc.h (modified) (1 diff)
libpolys/coeffs/gnumpfl.h (modified) (1 diff)
libpolys/coeffs/rintegers.h (modified) (1 diff)
libpolys/coeffs/rmodulon.h (modified) (1 diff)
libpolys/misc/auxiliary.h.in (modified) (3 diffs)
libpolys/misc/int64vec.h (modified) (1 diff)
libpolys/polys/kbuckets.cc (modified) (1 diff)
libpolys/polys/sbuckets.cc (modified) (1 diff)
libpolys/polys/templates/p_Procs_Set.h (modified) (1 diff)
libpolys/polys/weight0.c (modified) (1 diff)
libpolys/reporter/s_buff.cc (modified) (1 diff)
libpolys/tests/coeffs_test.h (modified) (1 diff)
libpolys/tests/common.h (modified) (1 diff)
libpolys/tests/simple_test.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

Singular/blackbox.cc

-                      rf5ec00
+                      r52e6ef
 #include <kernel/mod2.h>
-#include <misc/auxiliary.h>
 #include "tok.h"

Singular/blackbox.h

rf5ec00	r52e6ef
2	2	#define BLACKBOX_H
3	3
4		#include <~~misc/auxiliary~~.h>
	4	#include <kernel/mod2.h>
5	5	#include <omalloc/omalloc.h>
6	6

Singular/cntrlc.h

rf5ec00	r52e6ef
8	8	*/
9	9	#include <setjmp.h>
10		#include <~~misc/auxiliary~~.h>
	10	#include <kernel/mod2.h>
11	11	#include <kernel/structs.h>
12	12

Singular/dyn_modules/singmathic/singmathic.cc

rf5ec00	r52e6ef
3	3	#ifdef HAVE_MATHICGB
4	4
5		#include <~~misc/auxiliary~~.h>
	5	#include <kernel/mod2.h>
6	6
7	7	#include <misc/options.h>

Singular/extra.cc

rf5ec00	r52e6ef
12	12
13	13	#include <kernel/mod2.h>
14		~~#include <misc/auxiliary.h>~~
15	14	#include <misc/sirandom.h>
16	15	#include <resources/omFindExec.h>

Singular/fglm.h

rf5ec00	r52e6ef
2	2	#define SINGULAR_FGLM_H
3	3
4		#include <~~misc/auxiliary~~.h>
	4	#include <kernel/mod2.h>
5	5
6	6	#include <kernel/ideals.h>

Singular/gms.h

rf5ec00	r52e6ef
9	9	#define GMS_H
10	10
11		#include <~~misc/auxiliary~~.h>
	11	#include <kernel/mod2.h>
12	12	#include <polys/matpol.h>
13	13

Singular/grammar.cc

rf5ec00	r52e6ef
78	78
79	79	#include <kernel/mod2.h>
80		~~#include <misc/auxiliary.h>~~
81	80
82	81	#include <misc/mylimits.h>

Singular/grammar.y

rf5ec00	r52e6ef
14	14
15	15	#include <kernel/mod2.h>
16		~~#include <misc/auxiliary.h>~~
17	16
18	17	#include <misc/mylimits.h>

Singular/ipassign.cc

rf5ec00	r52e6ef
14	14	#include <kernel/mod2.h>
15	15
16		~~#include <misc/auxiliary.h>~~
17	16	#include <omalloc/omalloc.h>
18	17

Singular/ipshell.cc

rf5ec00	r52e6ef
12	12	#include <factory/factory.h>
13	13
14		~~#include <misc/auxiliary.h>~~
15	14	#include <misc/options.h>
16	15	#include <misc/mylimits.h>

Singular/libsingular.h

-                      rf5ec00
+                      r52e6ef
 #include <math.h> // Why this?
+#include <misc/auxiliary.h>
+#include <singularconfig.h>
+#include <kernel/mod2.h>
 #include <kernel/structs.h>
 #include <kernel/polys.h>

Singular/links/silink.h

rf5ec00	r52e6ef
8	8	*/
9	9
10		#include <~~misc/auxiliary~~.h>
	10	#include <singularconfig.h>
11	11	#include <kernel/structs.h>
12	12

Singular/maps_ip.h

rf5ec00	r52e6ef
8	8	*/
9	9
10		#include <~~misc/auxiliary~~.h>
	10	#include <kernel/mod2.h>
11	11	#include <polys/matpol.h>
12	12

Singular/misc_ip.cc

rf5ec00	r52e6ef
15	15
16	16	#include <kernel/mod2.h>
17		~~#include <misc/auxiliary.h>~~
18	17	#include <misc/sirandom.h>
19	18

Singular/misc_ip.h

rf5ec00	r52e6ef
24	24	#define MISC_H
25	25
26		#include <~~misc/auxiliary~~.h>
	26	#include <kernel/mod2.h>
27	27
28	28	#include <coeffs/si_gmp.h>

Singular/number2.h

rf5ec00	r52e6ef
2	2	#define NUMBER2_H
3	3
4		#include <~~misc/auxiliary~~.h>
	4	#include <kernel/mod2.h>
5	5
6	6	#ifdef SINGULAR_4_1

Singular/test.cc

rf5ec00	r52e6ef
6	6
7	7	#include <omalloc/omalloc.h>
8		~~#include <misc/auxiliary.h>~~
9	8
10	9	#include <factory/factory.h> // :(

Singular/tesths.cc

rf5ec00	r52e6ef
13	13	#include <omalloc/omalloc.h>
14	14
15		~~#include <misc/auxiliary.h>~~
16	15	#include <misc/options.h>
17	16

kernel/GBEngine/kpolys.cc

rf5ec00	r52e6ef
5	5
6	6	#include <omalloc/omalloc.h>
7		~~#include <misc/auxiliary.h>~~
8	7
9	8	#include <kernel/polys.h>

kernel/GBEngine/nc.cc

rf5ec00	r52e6ef
5	5
6	6	#include <kernel/mod2.h>
7		~~#include <misc/auxiliary.h>~~
8	7
9	8	#include <misc/options.h>

kernel/GBEngine/nc.h

-                      rf5ec00
+                      r52e6ef
 #ifndef KERNEL_NC_H
 #define KERNEL_NC_H
+#include <kernel/mod2.h>
 #ifdef HAVE_PLURAL
 …
 #endif // #ifdef PLURAL_INTERNAL_DECLARATIONS
-#include <misc/auxiliary.h>
 #include <polys/nc/nc.h>

kernel/GBEngine/sca.cc

rf5ec00	r52e6ef
5	5
6	6	#include <kernel/mod2.h>
7		~~#include <misc/auxiliary.h>~~
8	7
9	8	#include <misc/options.h>

kernel/GBEngine/test.cc

rf5ec00	r52e6ef
8	8	#include <factory/factory.h> // :(
9	9
10		~~#include <misc/auxiliary.h>~~
11	10	#include <misc/intvec.h>
12	11	#include <misc/int64vec.h>

kernel/combinatorics/hilb.cc

rf5ec00	r52e6ef
9	9
10	10	#include <omalloc/omalloc.h>
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/mylimits.h>
13	12	#include <misc/intvec.h>

kernel/combinatorics/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/fglm/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/groebner_walk/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/linear_algebra/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/maps/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/numeric/mpr_base.cc

rf5ec00	r52e6ef
14	14	#include <kernel/mod2.h>
15	15
16		~~#include <misc/auxiliary.h>~~
17	16	#include <omalloc/omalloc.h>
18	17

kernel/numeric/mpr_inout.cc

rf5ec00	r52e6ef
10	10
11	11	#include <kernel/mod2.h>
12		~~#include <misc/auxiliary.h>~~
13	12
14	13	//#ifdef HAVE_MPR

kernel/numeric/mpr_numeric.cc

rf5ec00	r52e6ef
11	11	#include <kernel/mod2.h>
12	12
13		~~#include <misc/auxiliary.h>~~
14	13	#include <omalloc/omalloc.h>
15	14

kernel/numeric/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/oswrapper/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/polys.cc

-                      rf5ec00
+                      r52e6ef
 #include <kernel/mod2.h>
 #include <omalloc/omalloc.h>
-#include <misc/auxiliary.h>
 #include <misc/options.h>

kernel/preimage.cc

-                      rf5ec00
+                      r52e6ef
 #include <kernel/mod2.h>
 #include <omalloc/omalloc.h>
-#include <misc/auxiliary.h>
 #include <misc/options.h>
 #include <misc/intvec.h>

kernel/spectrum/test.cc

rf5ec00	r52e6ef
9	9	#include <factory/factory.h> // :(
10	10
11		~~#include <misc/auxiliary.h>~~
12	11	#include <misc/intvec.h>
13	12	#include <misc/int64vec.h>

kernel/structs.h

-                      rf5ec00
+                      r52e6ef
 */
+#include <kernel/mod2.h>
 /* for omBin */
 #include <omalloc/omalloc.h>
 …
 /* C++-part */
 #ifdef __cplusplus
-#include <misc/auxiliary.h>
 #include <kernel/polys.h>
 #include <polys/coeffrings.h>

kernel/test.cc

rf5ec00	r52e6ef
2	2
3	3	#include <omalloc/omalloc.h>
4		~~#include <misc/auxiliary.h>~~
5	4	#include <factory/factory.h> // :(
6	5

libpolys/coeffs/AEp.h

rf5ec00	r52e6ef
2	2	#define AEP_H
3	3
4		#include <~~misc/auxiliary~~.h>
	4	#include <singularconfig.h>
5	5	#include "si_gmp.h"
6	6

libpolys/coeffs/coeffs.h

rf5ec00	r52e6ef
10	10	#define COEFFS_H
11	11
12		#include <misc/auxiliary.h>
	12	# include <misc/auxiliary.h>
13	13	#include <omalloc/omalloc.h>
14	14

libpolys/coeffs/flintcf_Q.cc

-                      rf5ec00
+                      r52e6ef
 #include <ctype.h> /* isdigit*/
-#ifdef HAVE_CONFIG_H
-#include "libpolysconfig.h"
-#endif /* HAVE_CONFIG_H */
 #include <misc/auxiliary.h>

libpolys/coeffs/flintcf_Zn.cc

-                      rf5ec00
+                      r52e6ef
 #include <ctype.h> /* isdigit*/
-#ifdef HAVE_CONFIG_H
-#include "libpolysconfig.h"
-#endif /* HAVE_CONFIG_H */
 #include <misc/auxiliary.h>

libpolys/coeffs/flintcf_Zn.h

-                      rf5ec00
+                      r52e6ef
 #define FLINTCF_ZN_H
+#include <singularconfig.h>
 #include <misc/auxiliary.h>
 #ifdef SINGULAR_4_1
 #ifdef HAVE_FLINT

libpolys/coeffs/gnumpc.h

rf5ec00	r52e6ef
7	7	* ABSTRACT: computations with GMP floating-point numbers
8	8	*/
	9	#include <singularconfig.h>
9	10	#include <misc/auxiliary.h>
10	11

libpolys/coeffs/gnumpfl.h

-                      rf5ec00
+                      r52e6ef
 */
+#include <singularconfig.h>
 #include <misc/auxiliary.h>
 struct n_Procs_s; typedef struct  n_Procs_s  *coeffs;

libpolys/coeffs/rintegers.h

rf5ec00	r52e6ef
8	8	*/
9	9	#include <misc/auxiliary.h>
10		~~#include <coeffs/coeffs.h>~~
11	10
12	11	#ifdef HAVE_RINGS

libpolys/coeffs/rmodulon.h

rf5ec00	r52e6ef
8	8	*/
9	9	#include <misc/auxiliary.h>
	10	#include <coeffs/coeffs.h>
10	11
11	12	struct n_Procs_s; typedef struct n_Procs_s *coeffs;

libpolys/misc/auxiliary.h.in

-                      rf5ec00
+                      r52e6ef
 /* please include libpolysconfig.h exclusively via <misc/auxiliary.h> and before any other header */
 #include "libpolysconfig.h"
-// ----------------- which parts/extensions of Singular to build
-#ifndef HAVE_RINGS
-#undef HAVE_RINGS
-#endif
-#ifndef HAVE_PLURAL
-#undef HAVE_PLURAL
-#endif
-#ifndef HAVE_DL
-#undef HAVE_DL
-#endif
-#ifndef HAVE_NTL
-#undef HAVE_NTL
-#endif
-/* letterplace gb:*/
-#ifndef HAVE_SHIFTBBA
-#undef HAVE_SHIFTBBA
-#endif
-#ifndef HAVE_POLYEXTENSIONS
-#undef HAVE_POLYEXTENSIONS
-#endif
-#ifndef DISABLE_GMP_CPP
-#undef DISABLE_GMP_CPP
-#endif
-#ifndef SINGULAR
-#undef SINGULAR
-#endif
-#ifndef NOSTREAMIO
-#undef NOSTREAMIO
-#endif
 /* the following cunstruct is to make it painless to add -DHAVE_NUMSTATS to CPPFLAGS for configure */
 …
 #undef HAVE_NUMSTATS
 #endif /* HAVE_NUMSTATS */
-// ----------------  end of parts/extensions
 // ---------------- Singular standard types etc.
 …
 // ---------------- defines which depend on the settings above
-#ifndef HAVE_MULT_MOD
-#undef HAVE_MULT_MOD
-#endif
-#ifndef HAVE_DIV_MOD
-#undef HAVE_DIV_MOD
-#endif
-#ifndef HAVE_GENERIC_ADD
-#undef HAVE_GENERIC_ADD
-#endif
 /*******************************************************************

libpolys/misc/int64vec.h

-                      rf5ec00
+                      r52e6ef
 */
 #include <string.h>
+#include <misc/auxiliary.h>
 #include <omalloc/omallocClass.h>
-#include <misc/auxiliary.h>
 #include <misc/intvec.h>

libpolys/polys/kbuckets.cc

-                      rf5ec00
+                      r52e6ef
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-//#include <kernel/mod2.h>
 #include <omalloc/omalloc.h>

libpolys/polys/sbuckets.cc

-                      rf5ec00
+                      r52e6ef
  *  Created: 9/00
  *******************************************************************/
-//#include <kernel/mod2.h>
 #include <omalloc/omalloc.h>
 #include <misc/auxiliary.h>

libpolys/polys/templates/p_Procs_Set.h

rf5ec00	r52e6ef
15	15
16	16	#include <reporter/reporter.h>
17		#include <~~libpolys/libpolysconfig~~.h>
	17	#include <misc/auxiliary.h>
18	18
19	19	// extract p_Procs properties from a ring

libpolys/polys/weight0.c

-                      rf5ec00
+                      r52e6ef
 * ABSTRACT:
 */
 #include <misc/auxiliary.h>

libpolys/reporter/s_buff.cc

rf5ec00	r52e6ef
9	9	#include <signal.h>
10	10
11		~~//#include <kernel/mod2.h>~~
12	11	#include <gmp.h>
13	12

libpolys/tests/coeffs_test.h

rf5ec00	r52e6ef
1
2
3
4	1	#include <misc/auxiliary.h>
5	2	#include <omalloc/omalloc.h>

libpolys/tests/common.h

-                      rf5ec00
+                      r52e6ef
 #include <cxxtest/TestSuite.h>
 #include <cxxtest/GlobalFixture.h>
 #include <misc/auxiliary.h>

libpolys/tests/simple_test.h

rf5ec00	r52e6ef
1
2
3
4	1	#include <misc/auxiliary.h>
5	2

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 52e6ef in git

Legend:

Download in other formats: