Changeset daa556 in git

Timestamp:

May 4, 2011, 6:34:14 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c2e9b1b9072522952d372f53ec641b403bf41564

Parents:

769f28d60d336f61783b5155674cfd7c687cf70a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-04 18:34:14+02:00

git-committer:

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

Message:

FIX: cf_gmp.h should be included after asser.h.... ??!?!

Location:

factory

Files:

• NTLconvert.cc (modified) (2 diffs)
• canonicalform.cc (modified) (2 diffs)
• cf_factor.cc (modified) (3 diffs)
• cf_factory.h (modified) (1 diff)
• cf_gmp.h (modified) (1 diff)
• fac_cantzass.cc (modified) (2 diffs)
• int_rat.h (modified) (2 diffs)
• singext.cc (modified) (1 diff)
• singext.h (modified) (1 diff)

factory/NTLconvert.cc

@@ -1 +1 @@
 /* $Id$ */
 #include <config.h>
-
-#include "cf_gmp.h"
 
 #include "assert.h"
@@ -15 +13 @@
 #include "fac_sqrfree.h"
 #include "cf_algorithm.h"
+
+#include "cf_gmp.h"
 
 #ifdef HAVE_NTL

factory/canonicalform.cc

@@ -5 +5 @@
 
 #include "assert.h"
+
+#include "cf_factory.h"
 
 #include "cf_defs.h"
@@ -11 +13 @@
 #include "cf_iter.h"
 #include "int_cf.h"
-#include "cf_factory.h"
 #include "cf_algorithm.h"
 #include "imm.h"

factory/cf_factor.cc

@@ -1 @@
-/* emacs edit mode for this file is -*- C++ -*- */
+/* Emacs edit mode for this file is -*- C++ -*- */
 /* $Id$ */
 
@@ -13 +13 @@
 
 #include <config.h>
-
-#include "cf_gmp.h"
 
 #include "assert.h"
@@ -38 +36 @@
 #include "NTLconvert.h"
 #endif
+
+#include "cf_gmp.h"
 
 int getExp(); /* cf_char.cc */

factory/cf_factory.h

@@ -7 +7 @@
 #include <config.h>
 
-#include "cf_gmp.h"
-
 #include "cf_defs.h"
 #include "variable.h"
+#include "cf_gmp.h"
 
 class InternalCF;

factory/cf_gmp.h

@@ +1 @@
+#ifndef CF_GMP_H
+#define CF_GMP_H
+
+
 #define __cplusplus_backup __cplusplus
 #undef __cplusplus
 extern "C" {
 #include <gmp.h>
-}
+};
 #define __cplusplus __cplusplus_backup
+
+
+#endif /* CF_GMP_H */

factory/fac_cantzass.cc

@@ -3 +3 @@
 
 #include <config.h>
-
-#include "cf_gmp.h"
 
 #include "assert.h"
@@ -14 +12 @@
 #include "fac_sqrfree.h"
 #include "gmpext.h"
+
+#include "cf_gmp.h"
 
 int initializeGMP();

factory/int_rat.h

@@ -17 +17 @@
 #endif /* NOSTREAMIO */
 
-#include "cf_gmp.h"
-
 #include "assert.h"
 
@@ -24 +22 @@
 #include "int_cf.h"
 #include "imm.h"
+#include "cf_gmp.h"
 
 class InternalRational : public InternalCF

factory/singext.cc

@@ -13 +13 @@
 #include "imm.h"
 #include "cf_factory.h"
+
+#include "cf_gmp.h"
+
 
 void gmp_numerator ( const CanonicalForm & f, mpz_ptr result )

factory/singext.h

@@ -7 +7 @@
 #include <config.h>
 
+#include "canonicalform.h"
 #include "cf_gmp.h"
-
-#include "canonicalform.h"
 
 // we need this to copy singulars GF(q) table to ours