File: regina.patch

package info (click to toggle)
regina-normal 5.1-6
  • links: PTS
  • area: main
  • in suites: bullseye, buster, sid
  • size: 54,488 kB
  • sloc: cpp: 142,029; ansic: 19,218; xml: 9,844; objc: 7,729; perl: 1,190; python: 623; sh: 614; makefile: 34
file content (65 lines) | stat: -rw-r--r-- 1,581 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
--- general.h
+++ general.h
@@ -28,9 +28,12 @@
 #include <iostream>
 #include <assert.h>
 
+/*
+// Regina will use GMP everywhere, even on Windows.
 #ifdef _WIN32 //for 32 and 64 bit windows
     #define NMZ_MPIR //always use MPIR
 #endif
+*/
 
 #ifdef NMZ_MPIR // use MPIR
     #include <mpirxx.h>
--- list_operations.h
+++ list_operations.h
@@ -46,7 +46,7 @@ ostream& operator<< (ostream& out, const list<T>& l) {
     for (i =l.begin(); i != l.end(); i++) {
         out << *i << " ";
     }
-    out << endl;
+    out << std::endl;
     return out;
 }
 
--- offload_handler.cpp
+++ offload_handler.cpp
@@ -9,6 +9,7 @@
 #include "libnormaliz/vector_operations.h"
 #include "libnormaliz/my_omp.h"
 #include "libnormaliz/HilbertSeries.h"
+#include <cstring>
 #include <iostream>
 #include <fstream>
 
--- full_cone.cpp
+++ full_cone.cpp
@@ -1512,8 +1512,10 @@ void Full_Cone<Integer>::evaluate_large_rec_pyramids(size_t new_generator){
     
     #pragma omp for schedule(dynamic) 
     for(size_t i=0; i<nrLargeRecPyrs; i++){
-        for(; i > ppos; ++ppos, ++p) ;
-        for(; i < ppos; --ppos, --p) ;
+        for(; i > ppos; ++ppos, ++p)
+            ;
+        for(; i < ppos; --ppos, --p)
+            ;
 #ifndef NCATCH
         try {
 #endif
--- general.h
+++ general.h
@@ -25,6 +25,11 @@
 #define GENERAL_H_
 
 
+/* We need to include cstddef before gmpxx.h to avoid a compile error with
+   older versions of GMP.  See https://gcc.gnu.org/gcc-4.9/porting_to.html ,
+   in the section about cstddef. */
+#include <cstddef>
+
 #include <iostream>
 #include <assert.h>