mirror of https://github.com/CGAL/cgal
Fix MSVC C4244 warnings
This commit is contained in:
parent
561bd80d96
commit
24b10a9135
|
|
@ -1,11 +1,11 @@
|
||||||
// computes the smallest enclosing annulus of two point
|
// computes the smallest enclosing annulus of two point
|
||||||
// sets on nested squares in R^2, using double
|
// sets on nested squares in R^2, using double
|
||||||
// as input type and some internal EXACT floating point type
|
// as input type and some internal EXACT floating point type
|
||||||
#include <iostream>
|
|
||||||
#include <cassert>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Min_annulus_d.h>
|
#include <CGAL/Min_annulus_d.h>
|
||||||
#include <CGAL/Min_sphere_annulus_d_traits_2.h>
|
#include <CGAL/Min_sphere_annulus_d_traits_2.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
|
#include <iostream>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
|
|
|
||||||
|
|
@ -3,15 +3,15 @@
|
||||||
// as input type and some internal EXACT floating point type;
|
// as input type and some internal EXACT floating point type;
|
||||||
// the fast type double is also safely used for many of the
|
// the fast type double is also safely used for many of the
|
||||||
// internal computations
|
// internal computations
|
||||||
#include <iostream>
|
|
||||||
#include <cassert>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Min_annulus_d.h>
|
#include <CGAL/Min_annulus_d.h>
|
||||||
#include <CGAL/Min_sphere_annulus_d_traits_2.h>
|
#include <CGAL/Min_sphere_annulus_d_traits_2.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
#include <CGAL/Exact_integer.h>
|
#include <CGAL/Exact_integer.h>
|
||||||
typedef CGAL::Exact_integer ET;
|
typedef CGAL::Exact_integer ET;
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
// use an inexact kernel...
|
// use an inexact kernel...
|
||||||
typedef CGAL::Homogeneous<double> K;
|
typedef CGAL::Homogeneous<double> K;
|
||||||
typedef K::Point_2 Point;
|
typedef K::Point_2 Point;
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,10 @@
|
||||||
#ifndef CGAL_MIN_ANNULUS_D_H
|
#ifndef CGAL_MIN_ANNULUS_D_H
|
||||||
#define CGAL_MIN_ANNULUS_D_H
|
#define CGAL_MIN_ANNULUS_D_H
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning(disable: 4244) // conversion warning in Boost iterator_adaptor
|
||||||
|
#endif
|
||||||
|
|
||||||
// includes
|
// includes
|
||||||
// --------
|
// --------
|
||||||
#include <CGAL/Optimisation/basic.h>
|
#include <CGAL/Optimisation/basic.h>
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,10 @@
|
||||||
// implementation: test program for Min_annulus (2D traits class)
|
// implementation: test program for Min_annulus (2D traits class)
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#include <CGAL/Cartesian.h>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Min_annulus_d.h>
|
#include <CGAL/Min_annulus_d.h>
|
||||||
#include <CGAL/Min_sphere_annulus_d_traits_2.h>
|
#include <CGAL/Min_sphere_annulus_d_traits_2.h>
|
||||||
|
#include <CGAL/Cartesian.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
#include <CGAL/Gmpq.h>
|
#include <CGAL/Gmpq.h>
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,10 @@
|
||||||
// implementation: test program for Min_annulus (3D traits class)
|
// implementation: test program for Min_annulus (3D traits class)
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#include <CGAL/Cartesian.h>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Min_annulus_d.h>
|
#include <CGAL/Min_annulus_d.h>
|
||||||
#include <CGAL/Min_sphere_annulus_d_traits_3.h>
|
#include <CGAL/Min_sphere_annulus_d_traits_3.h>
|
||||||
|
#include <CGAL/Cartesian.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
#include <CGAL/Gmpq.h>
|
#include <CGAL/Gmpq.h>
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,10 @@
|
||||||
// implementation: test program for Min_annulus (dD traits class)
|
// implementation: test program for Min_annulus (dD traits class)
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#include <CGAL/Cartesian_d.h>
|
|
||||||
#include <CGAL/Homogeneous_d.h>
|
|
||||||
#include <CGAL/Min_annulus_d.h>
|
#include <CGAL/Min_annulus_d.h>
|
||||||
#include <CGAL/Min_sphere_annulus_d_traits_d.h>
|
#include <CGAL/Min_sphere_annulus_d_traits_d.h>
|
||||||
|
#include <CGAL/Cartesian_d.h>
|
||||||
|
#include <CGAL/Homogeneous_d.h>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
#include <CGAL/Gmpq.h>
|
#include <CGAL/Gmpq.h>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
// computes the distance between two cubes in R^3 using double
|
// computes the distance between two cubes in R^3 using double
|
||||||
// as input type and some internal EXACT floating point type
|
// as input type and some internal EXACT floating point type
|
||||||
#include <iostream>
|
|
||||||
#include <cassert>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
#include <CGAL/Polytope_distance_d_traits_3.h>
|
#include <CGAL/Polytope_distance_d_traits_3.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
|
#include <iostream>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
// as input type and some internal EXACT floating point type;
|
// as input type and some internal EXACT floating point type;
|
||||||
// the fast type double is also safely used for many of the
|
// the fast type double is also safely used for many of the
|
||||||
// internal computations
|
// internal computations
|
||||||
#include <iostream>
|
|
||||||
#include <cassert>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
#include <CGAL/Polytope_distance_d_traits_3.h>
|
#include <CGAL/Polytope_distance_d_traits_3.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
|
#include <iostream>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,10 @@
|
||||||
#ifndef CGAL_POLYTOPE_DISTANCE_D_H
|
#ifndef CGAL_POLYTOPE_DISTANCE_D_H
|
||||||
#define CGAL_POLYTOPE_DISTANCE_D_H
|
#define CGAL_POLYTOPE_DISTANCE_D_H
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning(disable: 4244) // conversion warning in Boost iterator_adaptor
|
||||||
|
#endif
|
||||||
|
|
||||||
// includes
|
// includes
|
||||||
// --------
|
// --------
|
||||||
#include <CGAL/Optimisation/basic.h>
|
#include <CGAL/Optimisation/basic.h>
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
|
|
||||||
// includes and typedefs
|
// includes and typedefs
|
||||||
// ---------------------
|
// ---------------------
|
||||||
#include <CGAL/Cartesian_d.h>
|
|
||||||
#include <CGAL/Homogeneous_d.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
#include <CGAL/Optimisation_d_traits_d.h>
|
#include <CGAL/Optimisation_d_traits_d.h>
|
||||||
|
#include <CGAL/Cartesian_d.h>
|
||||||
|
#include <CGAL/Homogeneous_d.h>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
#include <CGAL/Gmpq.h>
|
#include <CGAL/Gmpq.h>
|
||||||
|
|
|
||||||
|
|
@ -25,10 +25,10 @@
|
||||||
// implementation: test program for polytope distance (2D traits class)
|
// implementation: test program for polytope distance (2D traits class)
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#include <CGAL/Cartesian.h>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
#include <CGAL/Polytope_distance_d_traits_2.h>
|
#include <CGAL/Polytope_distance_d_traits_2.h>
|
||||||
|
#include <CGAL/Cartesian.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
typedef CGAL::Gmpzf RT;
|
typedef CGAL::Gmpzf RT;
|
||||||
|
|
|
||||||
|
|
@ -25,10 +25,10 @@
|
||||||
// implementation: test program for polytope distance (3D traits class)
|
// implementation: test program for polytope distance (3D traits class)
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#include <CGAL/Cartesian.h>
|
|
||||||
#include <CGAL/Homogeneous.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
#include <CGAL/Polytope_distance_d_traits_3.h>
|
#include <CGAL/Polytope_distance_d_traits_3.h>
|
||||||
|
#include <CGAL/Cartesian.h>
|
||||||
|
#include <CGAL/Homogeneous.h>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
typedef CGAL::Gmpzf RT;
|
typedef CGAL::Gmpzf RT;
|
||||||
|
|
|
||||||
|
|
@ -25,10 +25,10 @@
|
||||||
// implementation: test program for polytope distance (dD traits class)
|
// implementation: test program for polytope distance (dD traits class)
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#include <CGAL/Cartesian_d.h>
|
|
||||||
#include <CGAL/Homogeneous_d.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
#include <CGAL/Polytope_distance_d_traits_d.h>
|
#include <CGAL/Polytope_distance_d_traits_d.h>
|
||||||
|
#include <CGAL/Cartesian_d.h>
|
||||||
|
#include <CGAL/Homogeneous_d.h>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
typedef CGAL::Gmpzf RT;
|
typedef CGAL::Gmpzf RT;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#include <iostream>
|
|
||||||
#include <CGAL/Cartesian_d.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
#include <CGAL/Polytope_distance_d_traits_d.h>
|
#include <CGAL/Polytope_distance_d_traits_d.h>
|
||||||
|
#include <CGAL/Cartesian_d.h>
|
||||||
|
#include <iostream>
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
typedef CGAL::Gmpzf ExactFPType;
|
typedef CGAL::Gmpzf ExactFPType;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
|
#include <CGAL/Polytope_distance_d.h>
|
||||||
|
#include <CGAL/Polytope_distance_d_traits_2.h>
|
||||||
|
#include <CGAL/Simple_cartesian.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#ifdef CGAL_USE_GMP
|
#ifdef CGAL_USE_GMP
|
||||||
#include <CGAL/Gmpzf.h>
|
#include <CGAL/Gmpzf.h>
|
||||||
typedef CGAL::Gmpzf ET;
|
typedef CGAL::Gmpzf ET;
|
||||||
|
|
@ -7,9 +9,6 @@ typedef CGAL::Gmpzf ET;
|
||||||
#include <CGAL/MP_Float.h>
|
#include <CGAL/MP_Float.h>
|
||||||
typedef CGAL::MP_Float ET;
|
typedef CGAL::MP_Float ET;
|
||||||
#endif
|
#endif
|
||||||
#include <CGAL/Simple_cartesian.h>
|
|
||||||
#include <CGAL/Polytope_distance_d.h>
|
|
||||||
#include <CGAL/Polytope_distance_d_traits_2.h>
|
|
||||||
|
|
||||||
typedef CGAL::Simple_cartesian<double> K;
|
typedef CGAL::Simple_cartesian<double> K;
|
||||||
typedef K::Point_2 Point;
|
typedef K::Point_2 Point;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue