From f3d98caccbc5ffcd85dc4517f9b8270a443544e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20G=C3=A4rtner?= Date: Fri, 23 Feb 2007 09:08:12 +0000 Subject: [PATCH] - some further warning fixes --- .../examples/QP_solver/solve_convex_hull_containment_lp2.h | 2 +- QP_solver/include/CGAL/QP_solver/QP_solver_validity_impl.h | 6 +++--- QP_solver/test/QP_solver/test_solver.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h b/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h index 8ce164b94bb..fd48b9aff36 100644 --- a/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h +++ b/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h @@ -34,6 +34,6 @@ solve_convex_hull_containment_lp (const Point_d& p, B_it (p.homogeneous_begin()), // b CGAL::Const_oneset_iterator(CGAL::EQUAL), // ~ CGAL::Const_oneset_iterator - ::Kernel::RT> (0)), ET(0)); // c + ::Kernel::RT> (0)), dummy); // c } diff --git a/QP_solver/include/CGAL/QP_solver/QP_solver_validity_impl.h b/QP_solver/include/CGAL/QP_solver/QP_solver_validity_impl.h index f93be88f3c1..064cdc7afd6 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_solver_validity_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_solver_validity_impl.h @@ -561,9 +561,9 @@ is_solution_optimal() const ET(lower_bound(col) * d) == x[col]; const bool upper_tight = has_finite_upper_bound(col) && ET(upper_bound(col) * d) == x[col]; - if ( lower_tight && !upper_tight && tau[col] et0) + if ( (lower_tight && !upper_tight && tau[col] et0)) return false; } diff --git a/QP_solver/test/QP_solver/test_solver.cpp b/QP_solver/test/QP_solver/test_solver.cpp index 43827c69905..9dd38bbaed6 100644 --- a/QP_solver/test/QP_solver/test_solver.cpp +++ b/QP_solver/test/QP_solver/test_solver.cpp @@ -367,7 +367,7 @@ bool process(const std::string& filename, type = Double_type; number_type = "double"; } - if ((type==Double_type && (is_int(IT())) || is_rational(IT())) || + if ((type==Double_type && (is_int(IT()) || is_rational(IT()))) || (type==Int_type && is_rational(IT())) || (type==Rational_type && (is_double(IT()) || is_int(IT())))) return true;