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
66
67
68
69
70
71
72
73
74
75
76
|
From 2a4aa1fbe40c2398e7cf008c360a3dcecad0c804 Mon Sep 17 00:00:00 2001
From: Tiago de Paula Peixoto <tiago@skewed.de>
Date: Wed, 21 Sep 2016 11:26:51 +0200
Subject: [PATCH] Fix compilation problem with newer CGAL
---
src/graph/generation/graph_triangulation.cc | 16 +++++++++-------
src/graph/generation/graph_triangulation.hh | 8 ++++----
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/graph/generation/graph_triangulation.cc b/src/graph/generation/graph_triangulation.cc
index 5642785..f63509a 100644
--- a/src/graph/generation/graph_triangulation.cc
+++ b/src/graph/generation/graph_triangulation.cc
@@ -15,10 +15,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-// As a special exception, you have permission to link this program
-// with the CGAL library and distribute executables, as long as you
-// follow the requirements of the GNU GPL in regard to all of the
-// software in the executable aside from CGAL.
+// As a special exception, you have permission to link this program
+// with the CGAL library and distribute executables, as long as you
+// follow the requirements of the GNU GPL in regard to all of the
+// software in the executable aside from CGAL.
#include "graph.hh"
#include "graph_util.hh"
@@ -52,11 +52,12 @@ bool operator==(const SimpleTriangulation::Vertex& a,
// periodic triangulation is only available in more recent versions of CGAL
#if (CGAL_VERSION_NR >= 1030500000)
-#include <CGAL/Periodic_3_triangulation_traits_3.h>
+#include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
#include <CGAL/Periodic_3_Delaunay_triangulation_3.h>
-typedef CGAL::Periodic_3_triangulation_traits_3<Kernel> GT;
+typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<Kernel> GT;
typedef CGAL::Periodic_3_Delaunay_triangulation_3<GT>
PeriodicDelaunayTriangulation;
+
namespace CGAL
{
bool operator==(const PeriodicDelaunayTriangulation::Vertex& a,
@@ -85,7 +86,8 @@ void triangulation(GraphInterface& gi, boost::python::object points,
if (type == "simple")
{
- get_triangulation<SimpleTriangulation, std::false_type>()(g, points_array, pos_map);
+ get_triangulation<SimpleTriangulation, std::false_type>()
+ (g, points_array, pos_map);
}
else if (type == "delaunay")
{
diff --git a/src/graph/generation/graph_triangulation.hh b/src/graph/generation/graph_triangulation.hh
index fffebe1..441bce5 100644
--- a/src/graph/generation/graph_triangulation.hh
+++ b/src/graph/generation/graph_triangulation.hh
@@ -15,10 +15,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-// As a special exception, you have permission to link this program
-// with the CGAL library and distribute executables, as long as you
-// follow the requirements of the GNU GPL in regard to all of the
-// software in the executable aside from CGAL.
+// As a special exception, you have permission to link this program
+// with the CGAL library and distribute executables, as long as you
+// follow the requirements of the GNU GPL in regard to all of the
+// software in the executable aside from CGAL.
#ifndef GRAPH_TRIANGULATION_HH
#define GRAPH_TRIANGULATION_HH
--
2.10.0
|