songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #561 from sgiraudot/CGAL-Bugfix_clang_is_convertible-GF 

Bugfix: pair not compatible with Point_3 (clang)
This commit is contained in:
Sebastien Loriot 2015-12-18 16:54:22 +01:00
parent 78dc72841e b5da6bb4f2
commit 0e1c696192
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cartesian_kernel/include/CGAL/Cartesian/Line_3.h
View File

@ -25,7 +25,6 @@
#ifndef CGAL_CARTESIAN_LINE_3_H
#define CGAL_CARTESIAN_LINE_3_H
#include <utility>
#include <CGAL/Handle_for.h>
namespace CGAL {
@ -42,7 +41,15 @@ class LineC3
typedef typename R_::Line_3 Line_3;
typedef typename R_::Segment_3 Segment_3;
typedef std::pair<Point_3, Vector_3> Rep;
struct Rep
{
Point_3 first;
Vector_3 second;
Rep () : first(), second() { }
Rep (const Point_3& p, const Vector_3& v) : first(p), second(v) { }
Rep (const Rep& r) : first(r.first), second(r.second) { }
};
typedef typename R_::template Handle<Rep>::type Base;
Base base;