From 2cbaad50da805d586c879a5d6a00b2f846ba64ef Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Wed, 16 Dec 2015 12:25:56 +0100 Subject: [PATCH] Bugfix: do not use std::pair in Line_3 to avoid is_convertible trouble with clang c++11 --- Cartesian_kernel/include/CGAL/Cartesian/Line_3.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h index 9a2864ad138..f3dfd68a415 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h @@ -25,7 +25,6 @@ #ifndef CGAL_CARTESIAN_LINE_3_H #define CGAL_CARTESIAN_LINE_3_H -#include #include namespace CGAL { @@ -42,7 +41,12 @@ class LineC3 typedef typename R_::Line_3 Line_3; typedef typename R_::Segment_3 Segment_3; - typedef std::pair Rep; + struct Rep + { + Point_3 first; + Vector_3 second; + }; + typedef typename R_::template Handle::type Base; Base base;