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

Kernel

This commit is contained in:
Andreas Fabri 2018-01-17 19:59:11 +00:00
parent 7675141f2b
commit 2e14ff9f04
8 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installation/include/CGAL/disable_warnings.h
View File

@ -23,9 +23,11 @@
# pragma warning(push)
# pragma warning(disable: 4099) // struct class mixed
# pragma warning(disable: 4127) // conditional expression is constant
# pragma warning(disable: 4355) // 'this' : used in base member initializer list
# pragma warning(disable: 4355) // 'this' : used in base member initializer list
# pragma warning(disable: 4510) // default constructor could not be generated
# pragma warning(disable: 4512) // assignment operator could not be generated
# pragma warning(disable: 4610) // can never be instantiated - user defined constructor required
# pragma warning(disable: 4706) // assignment within conditional expression
# pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used
#endif

4
Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h
View File

@ -27,6 +27,8 @@
#ifndef CGAL_LINE_2_ISO_RECTANGLE_2_INTERSECTION_H
#define CGAL_LINE_2_ISO_RECTANGLE_2_INTERSECTION_H
#include <CGAL/disable_warnings.h>
#include <CGAL/Line_2.h>
#include <CGAL/Iso_rectangle_2.h>
#include <CGAL/Line_2.h>
@ -223,4 +225,6 @@ CGAL_DO_INTERSECT_FUNCTION(Line_2, Iso_rectangle_2, 2)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h
View File

@ -27,6 +27,8 @@
#ifndef CGAL_RAY_2_ISO_RECTANGLE_2_INTERSECTION_H
#define CGAL_RAY_2_ISO_RECTANGLE_2_INTERSECTION_H
#include <CGAL/disable_warnings.h>
#include <CGAL/Iso_rectangle_2.h>
#include <CGAL/Ray_2.h>
#include <CGAL/Segment_2.h>
@ -211,4 +213,6 @@ CGAL_DO_INTERSECT_FUNCTION(Ray_2, Iso_rectangle_2, 2)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_RAY_2_iSO_RECTANGLE_2_INTERSECTION_H

4
Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h
View File

@ -27,6 +27,8 @@
#ifndef CGAL_SEGMENT_2_ISO_RECTANGLE_2_INTERSECTION_H
#define CGAL_SEGMENT_2_ISO_RECTANGLE_2_INTERSECTION_H
#include <CGAL/disable_warnings.h>
#include <CGAL/Iso_rectangle_2.h>
#include <CGAL/Segment_2.h>
#include <CGAL/Point_2.h>
@ -236,4 +238,6 @@ CGAL_DO_INTERSECT_FUNCTION(Segment_2, Iso_rectangle_2, 2)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_SEGMENT_2_ISO_RECTANGLE_2_INTERSECTION_H

3
Intersections_3/include/CGAL/intersection_3.h
View File

@ -27,6 +27,8 @@
#ifndef CGAL_INTERSECTION_3_H
#define CGAL_INTERSECTION_3_H
#include <CGAL/disable_warnings.h>
#include <CGAL/intersection_3_1.h>
#include <CGAL/internal/Intersections_3/Triangle_3_Line_3_intersection.h>
@ -50,5 +52,6 @@
#include <CGAL/internal/Intersections_3/Bbox_3_Sphere_3_do_intersect.h>
#include <CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h>
#include <CGAL/enable_warnings.h>
#endif // CGAL_INTERSECTION_3_H

2
Kernel_23/include/CGAL/Circle_2.h
View File

@ -273,7 +273,7 @@ extract(std::istream& is, Circle_2<R>& c)
{
typename R::Point_2 center;
typename R::FT squared_radius(0);
int o;
int o=0;
switch(get_mode(is)) {
case IO::ASCII :
is >> center >> iformat(squared_radius) >> o;

2
Kernel_23/include/CGAL/Sphere_3.h
View File

@ -319,7 +319,7 @@ extract(std::istream& is, Sphere_3<R>& c, const Homogeneous_tag&)
{
typename R::Point_3 center;
typename R::FT squared_radius;
int o;
int o=0;
switch(get_mode(is)) {
case IO::ASCII :
is >> center >> squared_radius >> o;

6
Number_types/include/CGAL/Quotient.h
View File

@ -91,7 +91,7 @@ class Quotient
{ Split_double<NT>()(n, num, den); }
Quotient(const CGAL_int(NT) & n)
: num(n), den(1) {}
: num(n), den(NT(1)) {}
template <class T>
explicit Quotient(const T& n) : num(n), den(1) {}
@ -403,8 +403,8 @@ quotient_cmp(const Quotient<NT>& x, const Quotient<NT>& y)
if (diff == 0)
{
int msign = CGAL_NTS sign(x.den) * CGAL_NTS sign(y.den);
NT leftop = x.num * y.den * msign;
NT rightop = y.num * x.den * msign;
NT leftop = NT(x.num * y.den * msign);
NT rightop = NT(y.num * x.den * msign);
return CGAL_NTS compare(leftop, rightop);
}
else