|
 |
34b5d7d |
diff -up src/c_lib/src/memory.c.orig src/c_lib/src/memory.c
|
|
|
34b5d7d |
--- src/c_lib/src/memory.c.orig 2014-02-07 11:01:49.674621000 -0200
|
|
|
34b5d7d |
+++ src/c_lib/src/memory.c 2014-02-07 11:02:02.046621474 -0200
|
|
|
d0a2caf |
@@ -18,7 +18,7 @@ AUTHORS:
|
|
|
86f823b |
****************************************************************************/
|
|
|
86f823b |
|
|
|
d0a2caf |
#include <Python.h>
|
|
|
86f823b |
-#include <mpir.h>
|
|
|
86f823b |
+#include <gmp.h>
|
|
|
d0a2caf |
#include "interrupt.h"
|
|
|
86f823b |
#include "memory.h"
|
|
|
86f823b |
|
|
|
34b5d7d |
diff -up src/sage/modular/arithgroup/farey.cpp.orig src/sage/modular/arithgroup/farey.cpp
|
|
|
34b5d7d |
--- src/sage/modular/arithgroup/farey.cpp.orig 2014-02-07 16:44:24.474408115 -0200
|
|
|
34b5d7d |
+++ src/sage/modular/arithgroup/farey.cpp 2014-02-07 16:44:33.100408446 -0200
|
|
|
34b5d7d |
@@ -141,6 +141,7 @@ operator*(const SL2Z& M, const vector
|
|
|
34b5d7d |
return result;
|
|
|
34b5d7d |
}
|
|
|
34b5d7d |
|
|
|
34b5d7d |
+#if 0
|
|
|
34b5d7d |
inline
|
|
|
34b5d7d |
mpz_class
|
|
|
34b5d7d |
floor(const mpq_class r) {
|
|
|
34b5d7d |
@@ -151,6 +152,7 @@ floor(const mpq_class r) {
|
|
|
34b5d7d |
return result - 1;
|
|
|
34b5d7d |
}
|
|
|
34b5d7d |
}
|
|
|
34b5d7d |
+#endif
|
|
|
34b5d7d |
|
|
|
34b5d7d |
inline
|
|
|
34b5d7d |
mpz_class lcm(const mpz_class& a, const mpz_class& b) {
|