diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_3.cpp b/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_3.cpp index cf194741ddd..8e76a00afe9 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_3.cpp +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_3.cpp @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) { -#ifdef CGAL_USE_SOQT +#ifdef CGAL_USE_COIN int n=10; int d=2; bool print_help=false; diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h b/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h index 40f9a1e817e..ea0a627f5d4 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h @@ -378,7 +378,7 @@ public: CGAL_precondition(it->object() == k); v_.pre_remove_vertex(it); - if (next(it) != end()) { + if (next(it) != Iterator(end())) { simulator_->delete_event(it->event()); it->set_event(Event_key()); } diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h index 13a8d5c4491..497f9aa90c2 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h @@ -1032,8 +1032,9 @@ protected: std::vector ics; triangulation().incident_cells(v, std::back_inserter(ics)); for (unsigned int i=0; i< ics.size(); ++i) { - int j; - bool ret=ics[i]->has_vertex(v, j); + int j=-1;// disable warning + bool ret=ics[i]->has_vertex(v, j); // initializes j + CGAL_assertion(j != -1); CGAL_assertion(ret); for (int k=0; k<4 ; ++k) { if (k==j) continue; diff --git a/Kinetic_data_structures/test/Kinetic_data_structures/numbers.cpp b/Kinetic_data_structures/test/Kinetic_data_structures/numbers.cpp index 4e4efde9f02..7bb330774bc 100644 --- a/Kinetic_data_structures/test/Kinetic_data_structures/numbers.cpp +++ b/Kinetic_data_structures/test/Kinetic_data_structures/numbers.cpp @@ -8,7 +8,7 @@ template void check_nt(NT v) { NT zero(0); - assert(v <= 0 || v > 0); // break symmetry due to compiler warning + assert(v <= zero || v > zero); // break symmetry due to compiler warning if (std::numeric_limits::has_infinity) { NT inf= std::numeric_limits::infinity(); //NT inf2=inf;