Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tiago Peixoto
graph-tool
Commits
2a4aa1fb
Commit
2a4aa1fb
authored
Sep 21, 2016
by
Tiago Peixoto
Browse files
Fix compilation problem with newer CGAL
parent
14a128d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
src/graph/generation/graph_triangulation.cc
src/graph/generation/graph_triangulation.cc
+9
-7
src/graph/generation/graph_triangulation.hh
src/graph/generation/graph_triangulation.hh
+4
-4
No files found.
src/graph/generation/graph_triangulation.cc
View file @
2a4aa1fb
...
...
@@ -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"
)
{
...
...
src/graph/generation/graph_triangulation.hh
View file @
2a4aa1fb
...
...
@@ -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
...
...
Tiago Peixoto
@count0
mentioned in issue
#333 (closed)
·
Sep 22, 2016
mentioned in issue
#333 (closed)
mentioned in issue #333
Toggle commit list
Steve
@stsmith
Mentioned in issue
#347 (closed)
·
Oct 21, 2016
Mentioned in issue
#347 (closed)
Mentioned in issue #347
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment