From a5d45c5f8d255c2f510f08e1fc297b8d2332d4cc Mon Sep 17 00:00:00 2001 From: Mariette Yvinec Date: Thu, 6 Aug 1998 14:49:56 +0000 Subject: [PATCH] *** empty log message *** --- .../CGAL/IO/triangulation_Window_stream.h | 37 +++++++++++-------- .../Triangulation_default_data_structure_2.h | 2 + .../CGAL/Triangulation_ds_circulators_2.h | 2 +- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/Packages/Triangulation_2/include/CGAL/IO/triangulation_Window_stream.h b/Packages/Triangulation_2/include/CGAL/IO/triangulation_Window_stream.h index eec5c7a8316..d8b99f435fa 100644 --- a/Packages/Triangulation_2/include/CGAL/IO/triangulation_Window_stream.h +++ b/Packages/Triangulation_2/include/CGAL/IO/triangulation_Window_stream.h @@ -54,15 +54,20 @@ CGAL_Window_stream& operator<<(CGAL_Window_stream& os, const CGAL_Delaunay_triangulation_2 &T) { - //return (os << (CGAL_Triangulation_2) T); + return (os << (CGAL_Triangulation_2) T); + // c'est pas une bonne idee parceque le cast + // utilise le createur + //CGAL_Triangulation_2(const CGAL_Triangulation_2 &tr) + //qui recopie toute les faces - CGAL_Delaunay_triangulation_2::Edge_iterator it = T.edges_begin(); - - while(it != T.edges_end()){ - os << T.segment(it); - ++it; - } - return os; +// CGAL_Delaunay_triangulation_2::Edge_iterator it = T.edges_begin(); +// +// while(it != T.edges_end()){ +// os << T.segment(it); +// ++it; +// } +// +// return os; } #endif // CGAL_WINDOW_STREAM_DELAUNAY_TRIANGULATION_2_H #endif // CGAL_DELAUNAY_TRIANGULATION_2_H @@ -76,15 +81,15 @@ operator<<(CGAL_Window_stream& os, const CGAL_Constrained_triangulation_2 &T) { - return (os << (CGAL_Triangulation_2) T); + //return (os << (CGAL_Triangulation_2) T); -// CGAL_Constrained_triangulation_2::Edge_iterator it = T.edges_begin(); -// -// while(it != T.edges_end()){ -// os << T.segment(it); -// ++it; -// } -// return os; + CGAL_Constrained_triangulation_2::Edge_iterator it = T.edges_begin(); + + while(it != T.edges_end()){ + os << T.segment(it); + ++it; + } + return os; } #endif // CGAL_WINDOW_STREAM_CONSTRAINED_TRIANGULATION_2_H diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h index 37e9c3eb949..0316df23d55 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h @@ -604,6 +604,7 @@ public: v2 = new Vertex(tds.finite_vertex()->point()); V[tds.finite_vertex()]=v2; set_finite_vertex(v2); + return; } // create the finite vertices @@ -674,6 +675,7 @@ public: }while(++fc != done); } CGAL_triangulation_postcondition( is_valid() ); + return; } diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h index 5b3b92d0898..e01f6258a08 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h @@ -1,4 +1,4 @@ -#ifndef CGAL_TRIANGULATION_DS_CIRCULATORS_2_H + #ifndef CGAL_TRIANGULATION_DS_CIRCULATORS_2_H #define CGAL_TRIANGULATION_DS_CIRCULATORS_2_H