songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various tweaks to avoid warnings and obscure errors

This commit is contained in:
Daniel Russel 2007-03-29 19:36:13 +00:00
parent 9daee64732
commit 81dac44112
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_3.cpp
View File

@ -18,7 +18,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef CGAL_USE_SOQT #ifdef CGAL_USE_COIN
int n=10; int n=10;
int d=2; int d=2;
bool print_help=false; bool print_help=false;

2
Kinetic_data_structures/include/CGAL/Kinetic/Sort.h
View File

@ -378,7 +378,7 @@ public:
CGAL_precondition(it->object() == k); CGAL_precondition(it->object() == k);
v_.pre_remove_vertex(it); v_.pre_remove_vertex(it);
if (next(it) != end()) { if (next(it) != Iterator(end())) {
simulator_->delete_event(it->event()); simulator_->delete_event(it->event());
it->set_event(Event_key()); it->set_event(Event_key());
} }

5
Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h
View File

@ -1032,8 +1032,9 @@ protected:
std::vector<Cell_handle> ics; std::vector<Cell_handle> ics;
triangulation().incident_cells(v, std::back_inserter(ics)); triangulation().incident_cells(v, std::back_inserter(ics));
for (unsigned int i=0; i< ics.size(); ++i) { for (unsigned int i=0; i< ics.size(); ++i) {
int j; int j=-1;// disable warning
bool ret=ics[i]->has_vertex(v, j); bool ret=ics[i]->has_vertex(v, j); // initializes j
CGAL_assertion(j != -1);
CGAL_assertion(ret); CGAL_assertion(ret);
for (int k=0; k<4 ; ++k) { for (int k=0; k<4 ; ++k) {
if (k==j) continue; if (k==j) continue;

2
Kinetic_data_structures/test/Kinetic_data_structures/numbers.cpp
View File

@ -8,7 +8,7 @@
template <class NT> template <class NT>
void check_nt(NT v) { void check_nt(NT v) {
NT zero(0); 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<NT>::has_infinity) { if (std::numeric_limits<NT>::has_infinity) {
NT inf= std::numeric_limits<NT>::infinity(); NT inf= std::numeric_limits<NT>::infinity();
//NT inf2=inf; //NT inf2=inf;