Fix MSVC C4244 warnings

2016-06-14 20:29:13 +02:00 · 2016-06-14 20:29:13 +02:00 · 24b10a9135
parent 561bd80d96
commit 24b10a9135
15 changed files with 40 additions and 33 deletions
--- a/Bounding_volumes/examples/Min_annulus_d/min_annulus_d.cpp
+++ b/Bounding_volumes/examples/Min_annulus_d/min_annulus_d.cpp
@ -1,11 +1,11 @@
 // computes the smallest enclosing annulus of two point
 // sets on nested squares in R^2, using double
 // 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_sphere_annulus_d_traits_2.h>
+#include <CGAL/Homogeneous.h>
+#include <iostream>
+#include <cassert>

 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
--- a/Bounding_volumes/examples/Min_annulus_d/min_annulus_d_fast_exact.cpp
+++ b/Bounding_volumes/examples/Min_annulus_d/min_annulus_d_fast_exact.cpp
@ -3,15 +3,15 @@
 // as input type and some internal EXACT floating point type;
 // the fast type double is also safely used for many of the
 // internal computations
-#include <iostream>
-#include <cassert>
-#include <CGAL/Homogeneous.h>
 #include <CGAL/Min_annulus_d.h>
 #include <CGAL/Min_sphere_annulus_d_traits_2.h>
-
+#include <CGAL/Homogeneous.h>
 #include <CGAL/Exact_integer.h>
 typedef CGAL::Exact_integer ET;

+#include <iostream>
+#include <cassert>
+
 // use an inexact kernel...
 typedef CGAL::Homogeneous<double>                          K;
 typedef K::Point_2                                         Point;
--- a/Bounding_volumes/include/CGAL/Min_annulus_d.h
+++ b/Bounding_volumes/include/CGAL/Min_annulus_d.h
@ -21,6 +21,10 @@
 #ifndef 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
 // --------
 #include <CGAL/Optimisation/basic.h>
--- a/Bounding_volumes/test/Bounding_volumes/test_Min_annulus_d_2.cpp
+++ b/Bounding_volumes/test/Bounding_volumes/test_Min_annulus_d_2.cpp
@ -24,10 +24,10 @@
 // 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_sphere_annulus_d_traits_2.h>
+#include <CGAL/Cartesian.h>
+#include <CGAL/Homogeneous.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 #include <CGAL/Gmpq.h>
--- a/Bounding_volumes/test/Bounding_volumes/test_Min_annulus_d_3.cpp
+++ b/Bounding_volumes/test/Bounding_volumes/test_Min_annulus_d_3.cpp
@ -24,10 +24,10 @@
 // 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_sphere_annulus_d_traits_3.h>
+#include <CGAL/Cartesian.h>
+#include <CGAL/Homogeneous.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 #include <CGAL/Gmpq.h>
--- a/Bounding_volumes/test/Bounding_volumes/test_Min_annulus_d_d.cpp
+++ b/Bounding_volumes/test/Bounding_volumes/test_Min_annulus_d_d.cpp
@ -24,10 +24,10 @@
 // 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_sphere_annulus_d_traits_d.h>
+#include <CGAL/Cartesian_d.h>
+#include <CGAL/Homogeneous_d.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 #include <CGAL/Gmpq.h>
--- a/Polytope_distance_d/examples/Polytope_distance_d/polytope_distance_d.cpp
+++ b/Polytope_distance_d/examples/Polytope_distance_d/polytope_distance_d.cpp
@ -1,10 +1,10 @@
 // computes the distance between two cubes in R^3 using double
 // 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_traits_3.h>
+#include <CGAL/Homogeneous.h>
+#include <iostream>
+#include <cassert>

 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
--- a/Polytope_distance_d/examples/Polytope_distance_d/polytope_distance_d_fast_exact.cpp
+++ b/Polytope_distance_d/examples/Polytope_distance_d/polytope_distance_d_fast_exact.cpp
@ -2,11 +2,11 @@
 // as input type and some internal EXACT floating point type;
 // the fast type double is also safely used for many of the
 // internal computations
-#include <iostream>
-#include <cassert>
-#include <CGAL/Homogeneous.h>
 #include <CGAL/Polytope_distance_d.h>
 #include <CGAL/Polytope_distance_d_traits_3.h>
+#include <CGAL/Homogeneous.h>
+#include <iostream>
+#include <cassert>

 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
--- a/Polytope_distance_d/include/CGAL/Polytope_distance_d.h
+++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d.h
@ -21,6 +21,10 @@
 #ifndef 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
 // --------
 #include <CGAL/Optimisation/basic.h>
--- a/Polytope_distance_d/test/Polytope_distance_d/test_PD.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/test_PD.cpp
@ -26,10 +26,10 @@

 // includes and typedefs
 // ---------------------
-#include <CGAL/Cartesian_d.h>
-#include <CGAL/Homogeneous_d.h>
 #include <CGAL/Polytope_distance_d.h>
 #include <CGAL/Optimisation_d_traits_d.h>
+#include <CGAL/Cartesian_d.h>
+#include <CGAL/Homogeneous_d.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 #include <CGAL/Gmpq.h>
--- a/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.cpp
@ -25,10 +25,10 @@
 // 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_traits_2.h>
+#include <CGAL/Cartesian.h>
+#include <CGAL/Homogeneous.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 typedef CGAL::Gmpzf RT;
--- a/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.cpp
@ -25,10 +25,10 @@
 // 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_traits_3.h>
+#include <CGAL/Cartesian.h>
+#include <CGAL/Homogeneous.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 typedef CGAL::Gmpzf RT;
--- a/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.cpp
@ -25,10 +25,10 @@
 // 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_traits_d.h>
+#include <CGAL/Cartesian_d.h>
+#include <CGAL/Homogeneous_d.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 typedef CGAL::Gmpzf RT;
--- a/Polytope_distance_d/test/Polytope_distance_d/wilms_bug.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/wilms_bug.cpp
@ -1,7 +1,7 @@
-#include <iostream>
-#include <CGAL/Cartesian_d.h>
 #include <CGAL/Polytope_distance_d.h>
 #include <CGAL/Polytope_distance_d_traits_d.h>
+#include <CGAL/Cartesian_d.h>
+#include <iostream>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 typedef CGAL::Gmpzf                            ExactFPType;
--- a/Polytope_distance_d/test/Polytope_distance_d/zwick_bug.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/zwick_bug.cpp
@ -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 <CGAL/basic.h>
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpzf.h>
 typedef CGAL::Gmpzf ET;
@ -7,9 +9,6 @@ typedef CGAL::Gmpzf ET;
 #include <CGAL/MP_Float.h>
 typedef CGAL::MP_Float ET;
 #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 K::Point_2                        Point;