From 3e037f0f15ca00075e304b6e5c0125e64f4e474d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 16 Jul 2015 14:44:56 +0200 Subject: [PATCH] fix warnings --- Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.cpp | 30 +++++++-------- Nef_S2/test/Nef_S2/Sphere_geometry-test.cpp | 38 +++++++++---------- .../CGAL/Polynomial/polynomial_functions.h | 4 +- .../test/Polynomial/Polynomial_traits_d.cpp | 12 +++--- .../test/Polynomial/modular_gcd_utils.cpp | 3 ++ Polynomial/test/Polynomial/polynomial_gcd.cpp | 8 ++-- Polynomial/test/Polynomial/test_polynomial.h | 6 +-- 7 files changed, 53 insertions(+), 48 deletions(-) diff --git a/Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.cpp b/Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.cpp index 1df523c77f9..04640c0fc79 100644 --- a/Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.cpp +++ b/Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.cpp @@ -49,17 +49,17 @@ int main(int, char**) // missing construction from segments and random init - CGAL_TEST((N1*N1) == N1); - CGAL_TEST((N1*!N1) == EMPTY); + CGAL_TEST((N1*N1) == N1){} + CGAL_TEST((N1*!N1) == EMPTY){} CGAL_NEF_TRACEV(N1); CGAL_NEF_TRACEV(!N1); CGAL_NEF_TRACEV(N1+!N1); - CGAL_TEST((N1+!N1) == SPHERE); - CGAL_TEST((N1^N2) == ((N1-N2)+(N2-N1))); // xor reformulation + CGAL_TEST((N1+!N1) == SPHERE){} + CGAL_TEST((N1^N2) == ((N1-N2)+(N2-N1))){} // xor reformulation CGAL_NEF_TRACEV((N1*N2)); CGAL_NEF_TRACEV(!(N1*N2)); CGAL_NEF_TRACEV((!N1+!N2)); CGAL_NEF_TRACEV(!(N1*N2) ^ (!N1+!N2)); - CGAL_TEST( (!(N1*N2)) == (!N1+!N2) ); // deMorgan + CGAL_TEST( (!(N1*N2)) == (!N1+!N2) ){} // deMorgan #if 1 Nef_polyhedron N3 = N1.intersection(N2); /* N3 is the two octants +++ and +-+ including the z-positive yz-halfplane @@ -68,24 +68,24 @@ int main(int, char**) Nef_polyhedron N4(S,S+2,Nef_polyhedron::INCLUDED); Nef_polyhedron N5(C,C+3,0.5); - CGAL_TEST(N3 < N1 && N3 < N2); - CGAL_TEST(N3 <= N1 && N3 <= N2); - CGAL_TEST(N1 > N3 && N2 > N3); - CGAL_TEST(N1 >= N3 && N2 >= N3); + CGAL_TEST(N3 < N1 && N3 < N2){} + CGAL_TEST(N3 <= N1 && N3 <= N2){} + CGAL_TEST(N1 > N3 && N2 > N3){} + CGAL_TEST(N1 >= N3 && N2 >= N3){} SVertex_const_handle v; SHalfedge_const_handle e; SFace_const_handle f; Object_handle h; h = N3.locate(p1); // on y-axis - CGAL_TEST( CGAL::assign(v,h) ); - CGAL_TEST( v->point() == p1 && !v->mark() ); + CGAL_TEST( CGAL::assign(v,h) ){} + CGAL_TEST( v->point() == p1 && !v->mark() ){} h = N3.locate(p2); - CGAL_TEST( CGAL::assign(e,h) ); - CGAL_TEST( e->circle() == c3 && !e->mark() ); + CGAL_TEST( CGAL::assign(e,h) ){} + CGAL_TEST( e->circle() == c3 && !e->mark() ){} h = N3.locate(p3); - CGAL_TEST( CGAL::assign(f,h) ); - CGAL_TEST( f->mark() ); + CGAL_TEST( CGAL::assign(f,h) ){} + CGAL_TEST( f->mark() ){} #endif CGAL_TEST_END; return 0; diff --git a/Nef_S2/test/Nef_S2/Sphere_geometry-test.cpp b/Nef_S2/test/Nef_S2/Sphere_geometry-test.cpp index c7c2c13bd59..feb6c22557c 100644 --- a/Nef_S2/test/Nef_S2/Sphere_geometry-test.cpp +++ b/Nef_S2/test/Nef_S2/Sphere_geometry-test.cpp @@ -25,29 +25,29 @@ int main() SPoint p(0,0,1), q(1,1,0), r(1,-1,0), s(1,1,1); SSegment s1(p,q), s2(p,r,false), s3(SPoint(0,-1,0),SPoint(-1,0,0)); SCircle c0, c1(p,q), c2(1,1,1), c3(Plane(1,1,1,0)); - CGAL_TEST(p.x() == NT(0)); - CGAL_TEST(p.y() == NT(0)); - CGAL_TEST(p.z() == NT(1)); - CGAL_TEST(p.antipode().antipode()==p); - CGAL_TEST(p.antipode()!=p); + CGAL_TEST(p.x() == NT(0)){} + CGAL_TEST(p.y() == NT(0)){} + CGAL_TEST(p.z() == NT(1)){} + CGAL_TEST(p.antipode().antipode()==p){} + CGAL_TEST(p.antipode()!=p){} - CGAL_TEST(c1.opposite().opposite()==c1); - CGAL_TEST(c1.has_on(p)&&c1.has_on(q)); - CGAL_TEST(c3.plane()==Plane(1,1,1,0)); + CGAL_TEST(c1.opposite().opposite()==c1){} + CGAL_TEST(c1.has_on(p)&&c1.has_on(q)){} + CGAL_TEST(c3.plane()==Plane(1,1,1,0)){} c1.split_at(p); c1.split_at_xy_plane(); - CGAL_TEST(s1.is_short()); - CGAL_TEST(s2.is_long()); - CGAL_TEST(s1.source()==p); - CGAL_TEST(s1.target()==q); - CGAL_TEST(s1.sphere_circle()==c1); - CGAL_TEST(s1.opposite().opposite()==s1); - CGAL_TEST(s1.complement().complement()==s1); - CGAL_TEST(SSegment(p,p,c1).is_degenerate()); - CGAL_TEST(SSegment(p,p.antipode(),c1).is_halfcircle()); - CGAL_TEST(s1.has_on(p)); - CGAL_TEST(SSegment(p,p.antipode(),c1).has_in_relative_interior(q)); + CGAL_TEST(s1.is_short()){} + CGAL_TEST(s2.is_long()){} + CGAL_TEST(s1.source()==p){} + CGAL_TEST(s1.target()==q){} + CGAL_TEST(s1.sphere_circle()==c1){} + CGAL_TEST(s1.opposite().opposite()==s1){} + CGAL_TEST(s1.complement().complement()==s1){} + CGAL_TEST(SSegment(p,p,c1).is_degenerate()){} + CGAL_TEST(SSegment(p,p.antipode(),c1).is_halfcircle()){} + CGAL_TEST(s1.has_on(p)){} + CGAL_TEST(SSegment(p,p.antipode(),c1).has_in_relative_interior(q)){} std::list L,Lp; std::list::iterator it; diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_functions.h b/Polynomial/include/CGAL/Polynomial/polynomial_functions.h index f9cd8635b4e..fd7ee9a237b 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_functions.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_functions.h @@ -143,8 +143,8 @@ substitute_xy( typedef typename CGAL::Coercion_traits< CGAL::Polynomial< NT >, NTX > CT; typedef typename CT::Type Coercion; - typedef typename CGAL::Coercion_traits< NT, NTX > CTi; - typedef typename CT::Type Coercion_i; +// typedef typename CGAL::Coercion_traits< NT, NTX > CTi; +// typedef typename CT::Type Coercion_i; typedef CGAL::Polynomial_traits_d < Coercion > PT_dc; std::vector< Coercion > replacements; diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d.cpp index 473cca38e61..95c98c51740 100644 --- a/Polynomial/test/Polynomial/Polynomial_traits_d.cpp +++ b/Polynomial/test/Polynomial/Polynomial_traits_d.cpp @@ -10,7 +10,7 @@ #include #include #include - +#include @@ -21,7 +21,8 @@ void test_AK_1(){ CGAL::set_pretty_mode(std::cerr); typedef typename AK::Integer Integer; - typedef typename AK::Rational Rational; + typedef typename AK::Rational Rational; + CGAL_USE_TYPE(Rational); typedef CGAL::Polynomial Poly; @@ -41,7 +42,7 @@ void test_AK_2(){ typedef typename AK::Integer Integer; typedef typename AK::Rational Rational; - + CGAL_USE_TYPE(Integer); typedef CGAL::Polynomial Poly; typedef CGAL::Polynomial_traits_d PT; @@ -82,7 +83,7 @@ void test_AK_5(){ typedef typename AK::Integer Integer; typedef typename AK::Rational Rational; - + CGAL_USE_TYPE(Integer); typedef CGAL::Polynomial< CGAL::Sqrt_extension< Rational, Rational > > Poly; @@ -105,7 +106,8 @@ void test_AK_6(){ typedef typename AK::Integer Integer; typedef typename AK::Rational Rational; - + CGAL_USE_TYPE(Integer); + CGAL_USE_TYPE(Rational); // Enforce IEEE double precision and to nearest before // using modular arithmetic diff --git a/Polynomial/test/Polynomial/modular_gcd_utils.cpp b/Polynomial/test/Polynomial/modular_gcd_utils.cpp index 3e3a45bfb79..e2db720271b 100644 --- a/Polynomial/test/Polynomial/modular_gcd_utils.cpp +++ b/Polynomial/test/Polynomial/modular_gcd_utils.cpp @@ -40,12 +40,15 @@ #include #include #include +#include #include template void test_modular_gcd_utils() { CGAL_SNAP_ARITHMETIC_KERNEL_TYPEDEFS(AT); + CGAL_USE_TYPE(Rational); + CGAL_USE_TYPE(Field_with_sqrt); CGAL::Random my_random(4711); ::CGAL::set_pretty_mode(std::cout); diff --git a/Polynomial/test/Polynomial/polynomial_gcd.cpp b/Polynomial/test/Polynomial/polynomial_gcd.cpp index cbc9a11f565..fdcf5090b81 100644 --- a/Polynomial/test/Polynomial/polynomial_gcd.cpp +++ b/Polynomial/test/Polynomial/polynomial_gcd.cpp @@ -638,10 +638,10 @@ void trivariate_polynomial_test() { typedef typename AT::Integer Integer; typedef typename AT::Rational Rational; - typedef CGAL::Sqrt_extension int_EXT_1; - typedef CGAL::Sqrt_extension int_EXT_2; - typedef CGAL::Sqrt_extension rat_EXT_1; - typedef CGAL::Sqrt_extension rat_EXT_2; +// typedef CGAL::Sqrt_extension int_EXT_1; +// typedef CGAL::Sqrt_extension int_EXT_2; +// typedef CGAL::Sqrt_extension rat_EXT_1; +// typedef CGAL::Sqrt_extension rat_EXT_2; { // testing trivariate polynomials with integer coefficients typedef CGAL::Polynomial int_POLY_1; diff --git a/Polynomial/test/Polynomial/test_polynomial.h b/Polynomial/test/Polynomial/test_polynomial.h index 59ab631b23e..d54865a2930 100644 --- a/Polynomial/test/Polynomial/test_polynomial.h +++ b/Polynomial/test/Polynomial/test_polynomial.h @@ -1024,9 +1024,9 @@ void test_AT(){ exact_tests(); }{ typedef typename AT::Rational Rational; - typedef typename CGAL::Polynomial Polynomial; - typedef CGAL::Euclidean_ring_tag Tag; - typedef CGAL::Tag_true Is_exact; +// typedef typename CGAL::Polynomial Polynomial; +// typedef CGAL::Euclidean_ring_tag Tag; +// typedef CGAL::Tag_true Is_exact; //can't use this test for Polynomials //CGAL::test_algebraic_structure(); basic_tests();