Ticket #52374: 0001-Fix-compilation-problem-with-newer-CGAL.patch

File 0001-Fix-compilation-problem-with-newer-CGAL.patch, 3.3 KB (added by count0 (Tiago de Paula Peixoto), 8 years ago)

Patch that solves the problem

  • src/graph/generation/graph_triangulation.cc 

    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 b  
    1515// You should have received a copy of the GNU General Public License
    1616// along with this program. If not, see <http://www.gnu.org/licenses/>.
    1717
    18 //  As a special exception, you have permission to link this program
    19 //  with the CGAL library and distribute executables, as long as you
    20 //  follow the requirements of the GNU GPL in regard to all of the
    21 //  software in the executable aside from CGAL.
     18// As a special exception, you have permission to link this program
     19// with the CGAL library and distribute executables, as long as you
     20// follow the requirements of the GNU GPL in regard to all of the
     21// software in the executable aside from CGAL.
    2222
    2323#include "graph.hh"
    2424#include "graph_util.hh"
    … … bool operator==(const SimpleTriangulation::Vertex& a, 
    5252
    5353// periodic triangulation is only available in more recent versions of CGAL
    5454#if (CGAL_VERSION_NR >= 1030500000)
    55 #include <CGAL/Periodic_3_triangulation_traits_3.h>
     55#include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
    5656#include <CGAL/Periodic_3_Delaunay_triangulation_3.h>
    57 typedef CGAL::Periodic_3_triangulation_traits_3<Kernel> GT;
     57typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<Kernel> GT;
    5858typedef CGAL::Periodic_3_Delaunay_triangulation_3<GT>
    5959    PeriodicDelaunayTriangulation;
     60
    6061namespace CGAL
    6162{
    6263bool operator==(const PeriodicDelaunayTriangulation::Vertex& a,
    … … void triangulation(GraphInterface& gi, boost::python::object points, 
    8586
    8687    if (type == "simple")
    8788    {
    88         get_triangulation<SimpleTriangulation, std::false_type>()(g, points_array, pos_map);
     89        get_triangulation<SimpleTriangulation, std::false_type>()
     90            (g, points_array, pos_map);
    8991    }
    9092    else if (type == "delaunay")
    9193    {

  • src/graph/generation/graph_triangulation.hh 

    diff --git a/src/graph/generation/graph_triangulation.hh b/src/graph/generation/graph_triangulation.hh
index fffebe1..441bce5 100644
    a b  
    1515// You should have received a copy of the GNU General Public License
    1616// along with this program. If not, see <http://www.gnu.org/licenses/>.
    1717
    18 //  As a special exception, you have permission to link this program
    19 //  with the CGAL library and distribute executables, as long as you
    20 //  follow the requirements of the GNU GPL in regard to all of the
    21 //  software in the executable aside from CGAL.
     18// As a special exception, you have permission to link this program
     19// with the CGAL library and distribute executables, as long as you
     20// follow the requirements of the GNU GPL in regard to all of the
     21// software in the executable aside from CGAL.
    2222
    2323#ifndef GRAPH_TRIANGULATION_HH
    2424#define GRAPH_TRIANGULATION_HH