From cda55de625c744439d77fa2e0e6e49fd20b421d8 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <Andreas.Fabri@geometryfactory.com>
Date: Wed, 20 Jan 2010 15:12:13 +0000
Subject: [PATCH] VC mixes up the local Ambient_dimension and
 CGAL::Ambient_dimension

---
 .../include/CGAL/Triangulation_data_structure_2.h         | 8 ++++----
 Triangulation_2/include/CGAL/Weighted_point.h             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h b/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
index 0974a25df04..6d6c46550d9 100644
--- a/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
@@ -315,7 +315,7 @@ public:
   bool is_valid(bool verbose = false, int level = 0) const;
   
   // HELPING
-private:
+  //AF: private:
   typedef std::pair<Vertex_handle,Vertex_handle> Vh_pair;
   void  set_adjacency(Face_handle fh, 
 		      int ih, 
@@ -2154,12 +2154,12 @@ reorient_faces()
   int nf  = std::distance(faces_begin(),faces_end());
 
   while (static_cast<int>(oriented_set.size()) != nf) {
-    while ( oriented_set.find(fit->handle()) != oriented_set.end()){
+    while ( oriented_set.find(fit) != oriented_set.end()){
       ++fit; // find a germ for  non oriented components 
     }
     // orient component
-    oriented_set.insert(fit->handle());
-    st.push(fit->handle());
+    oriented_set.insert(fit);
+    st.push(fit);
     while ( ! st.empty()) {
       Face_handle fh = st.top();
       st.pop();
diff --git a/Triangulation_2/include/CGAL/Weighted_point.h b/Triangulation_2/include/CGAL/Weighted_point.h
index dca7a1cb6d5..5a574e32e6f 100644
--- a/Triangulation_2/include/CGAL/Weighted_point.h
+++ b/Triangulation_2/include/CGAL/Weighted_point.h
@@ -66,7 +66,7 @@ public:
   Weighted_point (const Tx &x, const Ty &y,
 	          typename boost::enable_if< boost::mpl::and_<boost::is_convertible<Tx, FT>,
 					                      boost::is_convertible<Ty, FT>,
-							      boost::mpl::bool_<Ambient_dimension<Point>::value == 2> > >::type* = 0)
+							      boost::mpl::bool_<CGAL::Ambient_dimension<Point>::value == 2> > >::type* = 0)
       : Point(x, y), _weight(0) {}
 
   template < typename Tx, typename Ty, typename Tz >
@@ -74,7 +74,7 @@ public:
 	          typename boost::enable_if< boost::mpl::and_<boost::is_convertible<Tx, FT>,
 					                      boost::is_convertible<Ty, FT>,
 					                      boost::is_convertible<Tz, FT>,
-							      boost::mpl::bool_<Ambient_dimension<Point>::value == 3> > >::type* = 0)
+							      boost::mpl::bool_<CGAL::Ambient_dimension<Point>::value == 3> > >::type* = 0)
       : Point(x, y, z), _weight(0) {}
 
   const Point & point() const