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

Fixes for FT=mpq_class. 

In particular, the constructor from std::string is explicit.
test_nef_3_io_EPEC is still broken because of that.
This commit is contained in:
Marc Glisse 2016-10-14 00:37:11 +02:00
parent 2868790cf4
commit 030d81e3f7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h
View File

@ -159,7 +159,7 @@ namespace internal {
return -sides[SIDE].y()*alpha + sides[SIDE].x()*beta; return -sides[SIDE].y()*alpha + sides[SIDE].x()*beta;
default: default:
CGAL_error(); CGAL_error();
return typename K::FT(0.); return typename K::FT(0);
} }
} }
@ -192,8 +192,8 @@ namespace internal {
typename K::Point_3 p_min, p_max; typename K::Point_3 p_min, p_max;
get_min_max<K, AXE>(AXE==0? 0: AXE==1? sides[SIDE].z(): -sides[SIDE].y(), get_min_max<K, AXE>(AXE==0? 0: AXE==1? sides[SIDE].z(): -sides[SIDE].y(),
AXE==0? -sides[SIDE].z(): AXE==1? 0: sides[SIDE].x(), AXE==0? -sides[SIDE].z(): AXE==1? 0: sides[SIDE].x(),
AXE==0? sides[SIDE].y(): AXE==1? -sides[SIDE].x(): 0, AXE==0? sides[SIDE].y(): AXE==1? -sides[SIDE].x():
bbox, p_min, p_max); typename K::FT(0), bbox, p_min, p_max);
switch ( AXE ) switch ( AXE )
{ {

4
Nef_3/test/Nef_3/test_nef_3_io_Cartesian_Lazy.cpp
View File

@ -23,8 +23,8 @@ void test_write_read()
typedef CGAL::Polyhedron_3< Kernel > Polyhedron; typedef CGAL::Polyhedron_3< Kernel > Polyhedron;
typedef typename Kernel::Point_3 Point; typedef typename Kernel::Point_3 Point;
typename Kernel::RT n( std::string("6369051672525773")); typename Kernel::RT n(RT(std::string("6369051672525773")));
typename Kernel::RT d( std::string("4503599627370496")); typename Kernel::RT d(RT(std::string("4503599627370496")));
Point p(n, 0, 0, d); Point p(n, 0, 0, d);
Point q(0, n, 0, d); Point q(0, n, 0, d);

4
Nef_3/test/Nef_3/test_nef_3_io_Homogenoeus_Lazy.cpp
View File

@ -23,8 +23,8 @@ void test_write_read()
typedef CGAL::Polyhedron_3< Kernel > Polyhedron; typedef CGAL::Polyhedron_3< Kernel > Polyhedron;
typedef typename Kernel::Point_3 Point; typedef typename Kernel::Point_3 Point;
typename Kernel::RT n( std::string("6369051672525773")); typename Kernel::RT n(RT(std::string("6369051672525773")));
typename Kernel::RT d( std::string("4503599627370496")); typename Kernel::RT d(RT(std::string("4503599627370496")));
Point p(n, 0, 0, d); Point p(n, 0, 0, d);
Point q(0, n, 0, d); Point q(0, n, 0, d);