From b78a9ca15f3e70c865cf7752f79b54900bc95cd3 Mon Sep 17 00:00:00 2001
From: Ophir Setter <ophirset@post.tau.ac.il>
Date: Thu, 28 May 2009 18:17:09 +0000
Subject: [PATCH] renaming of header

---
 .gitattributes                                            | 2 +-
 ...urface_diagram_2.h => Envelope_diagram_on_surface_2.h} | 4 ++--
 .../include/CGAL/Envelope_3/Envelope_element_visitor_3.h  | 8 ++++----
 Envelope_3/include/CGAL/envelope_3.h                      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename Envelope_3/include/CGAL/Envelope_3/{Envelope_on_surface_diagram_2.h => Envelope_diagram_on_surface_2.h} (98%)

diff --git a/.gitattributes b/.gitattributes
index 10f18f15b44..f72c6c73d82 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1413,7 +1413,7 @@ Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.fig -text svneol=unset#applicatio
 Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.gif -text svneol=unset#image/gif
 Envelope_3/doc_tex/Envelope_3/fig/ex_triangles.pdf -text svneol=unset#application/pdf
 Envelope_3/examples/Envelope_3/spheres.dat -text
-Envelope_3/include/CGAL/Envelope_3/Envelope_on_surface_diagram_2.h -text
+Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h -text
 Envelope_3/test/Envelope_3/data/spheres/stest.cin -text
 Envelope_3/test/Envelope_3/data/spheres/stest10.cin -text
 Envelope_3/test/Envelope_3/data/spheres/stest11.cin -text
diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_on_surface_diagram_2.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h
similarity index 98%
rename from Envelope_3/include/CGAL/Envelope_3/Envelope_on_surface_diagram_2.h
rename to Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h
index 9adc09d60da..ce26c4fb9a7 100644
--- a/Envelope_3/include/CGAL/Envelope_3/Envelope_on_surface_diagram_2.h
+++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h
@@ -19,8 +19,8 @@
 //                 Ophir Setter           <ophirset@post.tau.ac.il>
 //                 Efi Fogel              <efif@post.tau.ac.il>
 
-#ifndef CGAL_ENVELOPE_ON_SURFACE_DIAGRAM_2_H
-#define CGAL_ENVELOPE_ON_SURFACE_DIAGRAM_2_H
+#ifndef CGAL_ENVELOPE_DIAGRAM_ON_SURFACE_2_H
+#define CGAL_ENVELOPE_DIAGRAM_ON_SURFACE_2_H
 
 #include <CGAL/Arrangement_on_surface_2.h>
 #include <CGAL/Arr_spherical_topology_traits_2.h>
diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h
index 22003122e88..4b1321a62c3 100644
--- a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h
+++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h
@@ -219,7 +219,7 @@ public:
     Face_handle copied_face = copy_face(face, result, copied_face_arr,
                                         map_copied_to_orig_halfedges,
                                         map_copied_to_orig_vertices);
-    CGAL_assertion(is_valid(copied_face_arr));
+//    CGAL_assertion(is_valid(copied_face_arr));
     map_copied_to_orig_faces[copied_face] = face;
     
     
@@ -1705,7 +1705,7 @@ protected:
                          Halfedges_map& map_copied_to_orig_halfedges,
                          Vertices_map&  map_copied_to_orig_vertices)
   {
-    CGAL_precondition (from.is_valid());
+//    CGAL_precondition (from.is_valid());
     CGAL_precondition (to.is_empty());
     CGAL_assertion_msg (to.number_of_faces() == 1, "There should be one face in an empty arrangement");
 
@@ -1741,7 +1741,7 @@ protected:
                   map_orig_to_copied_vertices,
                   true);
       }
-      CGAL_assertion(is_valid(to));
+//      CGAL_assertion(is_valid(to));
 
       // Get a handle to the copied face, which is the incident face
       // of the copy we created for hec.
@@ -1769,7 +1769,7 @@ protected:
                 map_orig_to_copied_halfedges,
                 map_orig_to_copied_vertices,
                 false);
-      CGAL_assertion(is_valid(to));
+//      CGAL_assertion(is_valid(to));
     }
 
     // Copy the isolated vertices inside the given face.
diff --git a/Envelope_3/include/CGAL/envelope_3.h b/Envelope_3/include/CGAL/envelope_3.h
index babbc6552f5..f3fa76e5721 100644
--- a/Envelope_3/include/CGAL/envelope_3.h
+++ b/Envelope_3/include/CGAL/envelope_3.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_ENVELOPE_3_H
 #define CGAL_ENVELOPE_3_H
 
-#include <CGAL/Envelope_3/Envelope_on_surface_diagram_2.h>
+#include <CGAL/Envelope_3/Envelope_diagram_on_surface_2.h>
 #include <CGAL/Envelope_3/Envelope_divide_and_conquer_3.h>
 #include <CGAL/Arr_accessor.h>
 
@@ -57,7 +57,7 @@ void lower_envelope_3 (InputIterator begin, InputIterator end,
 template <class InputIterator, class Traits,
           class T_Dcel>
 void upper_envelope_3 (InputIterator begin, InputIterator end,
-                       Envelope_diagram_2<Traits>& max_diagram)
+                       Envelope_diagram_2<Traits, T_Dcel>& max_diagram)
 {
   typedef Traits                                            Traits_3;
   typedef typename Envelope_diagram_2<Traits_3, T_Dcel>::Arrangement              Envelope_diagram_2;