bernhard@3318
|
1 |
From: Bernhard Walle <bernhard@bwalle.de>
|
bernhard@3318
|
2 |
Subject: Fix compilation with gcc 4.9 (ptrdiff_t errors)
|
bernhard@3318
|
3 |
|
bernhard@3318
|
4 |
This is a backport of following patch in ppl git
|
bernhard@3318
|
5 |
|
bernhard@3318
|
6 |
commit 61d4e14dfd9f1121e9b4521dead5728b2424dd7c
|
bernhard@3318
|
7 |
Author: Roberto Bagnara <bagnara@cs.unipr.it>
|
bernhard@3318
|
8 |
Date: Tue Apr 29 21:51:43 2014 +0200
|
bernhard@3318
|
9 |
|
bernhard@3318
|
10 |
Added missing inclusions. Use std::ptrdiff_t.
|
bernhard@3318
|
11 |
(Thanks to Paulo Cesar Pereira de Andrade.)
|
bernhard@3318
|
12 |
|
bernhard@3318
|
13 |
---
|
bernhard@3318
|
14 |
src/Congruence_System.defs.hh | 3 ++-
|
bernhard@3318
|
15 |
src/Constraint_System.defs.hh | 3 ++-
|
bernhard@3318
|
16 |
src/Generator_System.defs.hh | 3 ++-
|
bernhard@3318
|
17 |
src/Grid_Generator_System.defs.hh | 3 ++-
|
bernhard@3318
|
18 |
4 files changed, 8 insertions(+), 4 deletions(-)
|
bernhard@3318
|
19 |
|
bernhard@3318
|
20 |
--- a/src/Grid_Generator_System.defs.hh
|
bernhard@3318
|
21 |
+++ b/src/Grid_Generator_System.defs.hh
|
bernhard@3318
|
22 |
@@ -30,6 +30,7 @@ site: http://www.cs.unipr.it/ppl/ . */
|
bernhard@3318
|
23 |
#include "Variables_Set.types.hh"
|
bernhard@3318
|
24 |
#include "Grid.types.hh"
|
bernhard@3318
|
25 |
#include <iosfwd>
|
bernhard@3318
|
26 |
+#include <cstddef>
|
bernhard@3318
|
27 |
|
bernhard@3318
|
28 |
namespace Parma_Polyhedra_Library {
|
bernhard@3318
|
29 |
|
bernhard@3318
|
30 |
@@ -267,7 +268,7 @@ public:
|
bernhard@3318
|
31 |
class const_iterator
|
bernhard@3318
|
32 |
: public std::iterator<std::forward_iterator_tag,
|
bernhard@3318
|
33 |
Grid_Generator,
|
bernhard@3318
|
34 |
- ptrdiff_t,
|
bernhard@3318
|
35 |
+ std::ptrdiff_t,
|
bernhard@3318
|
36 |
const Grid_Generator*,
|
bernhard@3318
|
37 |
const Grid_Generator&>,
|
bernhard@3318
|
38 |
private Generator_System::const_iterator {
|
bernhard@3318
|
39 |
--- a/src/Congruence_System.defs.hh
|
bernhard@3318
|
40 |
+++ b/src/Congruence_System.defs.hh
|
bernhard@3318
|
41 |
@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
|
bernhard@3318
|
42 |
#include "Grid.types.hh"
|
bernhard@3318
|
43 |
#include "Grid_Certificate.types.hh"
|
bernhard@3318
|
44 |
#include <iosfwd>
|
bernhard@3318
|
45 |
+#include <cstddef>
|
bernhard@3318
|
46 |
|
bernhard@3318
|
47 |
namespace Parma_Polyhedra_Library {
|
bernhard@3318
|
48 |
|
bernhard@3318
|
49 |
@@ -235,7 +236,7 @@ public:
|
bernhard@3318
|
50 |
class const_iterator
|
bernhard@3318
|
51 |
: public std::iterator<std::forward_iterator_tag,
|
bernhard@3318
|
52 |
Congruence,
|
bernhard@3318
|
53 |
- ptrdiff_t,
|
bernhard@3318
|
54 |
+ std::ptrdiff_t,
|
bernhard@3318
|
55 |
const Congruence*,
|
bernhard@3318
|
56 |
const Congruence&> {
|
bernhard@3318
|
57 |
public:
|
bernhard@3318
|
58 |
--- a/src/Constraint_System.defs.hh
|
bernhard@3318
|
59 |
+++ b/src/Constraint_System.defs.hh
|
bernhard@3318
|
60 |
@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
|
bernhard@3318
|
61 |
#include "Congruence_System.types.hh"
|
bernhard@3318
|
62 |
#include <iterator>
|
bernhard@3318
|
63 |
#include <iosfwd>
|
bernhard@3318
|
64 |
+#include <cstddef>
|
bernhard@3318
|
65 |
|
bernhard@3318
|
66 |
namespace Parma_Polyhedra_Library {
|
bernhard@3318
|
67 |
|
bernhard@3318
|
68 |
@@ -204,7 +205,7 @@ public:
|
bernhard@3318
|
69 |
class const_iterator
|
bernhard@3318
|
70 |
: public std::iterator<std::forward_iterator_tag,
|
bernhard@3318
|
71 |
Constraint,
|
bernhard@3318
|
72 |
- ptrdiff_t,
|
bernhard@3318
|
73 |
+ std::ptrdiff_t,
|
bernhard@3318
|
74 |
const Constraint*,
|
bernhard@3318
|
75 |
const Constraint&> {
|
bernhard@3318
|
76 |
public:
|
bernhard@3318
|
77 |
--- a/src/Generator_System.defs.hh
|
bernhard@3318
|
78 |
+++ b/src/Generator_System.defs.hh
|
bernhard@3318
|
79 |
@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
|
bernhard@3318
|
80 |
#include "Polyhedron.types.hh"
|
bernhard@3318
|
81 |
#include "Poly_Con_Relation.defs.hh"
|
bernhard@3318
|
82 |
#include <iosfwd>
|
bernhard@3318
|
83 |
+#include <cstddef>
|
bernhard@3318
|
84 |
|
bernhard@3318
|
85 |
namespace Parma_Polyhedra_Library {
|
bernhard@3318
|
86 |
|
bernhard@3318
|
87 |
@@ -250,7 +251,7 @@ public:
|
bernhard@3318
|
88 |
class const_iterator
|
bernhard@3318
|
89 |
: public std::iterator<std::forward_iterator_tag,
|
bernhard@3318
|
90 |
Generator,
|
bernhard@3318
|
91 |
- ptrdiff_t,
|
bernhard@3318
|
92 |
+ std::ptrdiff_t,
|
bernhard@3318
|
93 |
const Generator*,
|
bernhard@3318
|
94 |
const Generator&> {
|
bernhard@3318
|
95 |
public:
|