From a5f006da60d01db087cc789900933fae63efd2ff Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Fri, 25 Jul 2008 14:28:01 +0000
Subject: [PATCH] Replace CGAL::Quadruple by boost::tuple.

---
 Stream_lines_2/include/CGAL/Stream_lines_2.h | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Stream_lines_2/include/CGAL/Stream_lines_2.h b/Stream_lines_2/include/CGAL/Stream_lines_2.h
index 30fe0fb360e..9eb90dc670a 100644
--- a/Stream_lines_2/include/CGAL/Stream_lines_2.h
+++ b/Stream_lines_2/include/CGAL/Stream_lines_2.h
@@ -26,8 +26,7 @@
 #include <CGAL/Delaunay_triangulation_2.h>
 
 #include <queue>
-#include <math.h>
-
+#include <cmath>
 #include <fstream>
 #include <iostream>
 
@@ -35,6 +34,8 @@
 
 #include <CGAL/streamlines_assertions.h>
 
+#include <boost/tuple/tuple.hpp>
+
 CGAL_BEGIN_NAMESPACE
 
 template <class VectorField_2, class Integrator_2>
@@ -57,8 +58,7 @@ protected:
   typedef typename DT::Face_circulator                                                    Face_circulator;
   typedef typename DT::Edge_iterator                                                      Edge_iterator;
   typedef std::pair<Point_2,FT>                                                           Circle;
-  typedef
-  CGAL::Quadruple<Vertex_handle,Vertex_handle,Vertex_handle,Circle>                       Pq_element;
+  typedef boost::tuple<Vertex_handle,Vertex_handle,Vertex_handle,Circle>                  Pq_element;
   Pq_element                                                                              Biggest_circle;
   FT distance(const Point_2 & p, const Point_2 & q)
     {
@@ -87,7 +87,7 @@ protected:
     bool operator()(const Pq_element &a1, const Pq_element
         &a2)
       {
-  return a1.fourth.second < a2.fourth.second ;
+        return a1.get<3>().second < a2.get<3>().second ;
       }
   };
   std::priority_queue<Pq_element, std::vector<Pq_element>, C>    pq;
@@ -676,10 +676,10 @@ pq_elements(const Vector_field_2 & vector_field_2, Vertex_container_2 stl_vertic
       else
         {
     Pq_next_r = m_Pq_element;
-    if (Pq_element_max_r.fourth.second <= Pq_next_r.fourth.second)
+    if (Pq_element_max_r.get<3>().second <= Pq_next_r.get<3>().second)
       Pq_element_max_r = Pq_next_r;
-    if ((Pq_current_r.fourth.second>=Pq_previous_r.fourth.second)
-        &&(Pq_current_r.fourth.second>=Pq_next_r.fourth.second))
+    if ((Pq_current_r.get<3>().second>=Pq_previous_r.get<3>().second)
+        &&(Pq_current_r.get<3>().second>=Pq_next_r.get<3>().second))
       {
         pq.push(Pq_current_r);
       }
@@ -714,10 +714,10 @@ pq_elements(const Vector_field_2 & vector_field_2, Vertex_container_2 stl_vertic
       else
         {
     Pq_next_l = m_Pq_element;
-    if (Pq_element_max_l.fourth.second <= Pq_next_l.fourth.second) 
+    if (Pq_element_max_l.get<3>().second <= Pq_next_l.get<3>().second) 
       Pq_element_max_l = Pq_next_l;
-    if ((Pq_current_l.fourth.second>=Pq_previous_l.fourth.second)
-        &&(Pq_current_l.fourth.second>=Pq_next_l.fourth.second))
+    if ((Pq_current_l.get<3>().second>=Pq_previous_l.get<3>().second)
+        &&(Pq_current_l.get<3>().second>=Pq_next_l.get<3>().second))
       {
         pq.push(Pq_current_l);
       }
@@ -773,14 +773,14 @@ Stream_lines_2<VectorField_2, Integrator_2>::get_next_seed_point(FT &
   do{
     CGAL_assertion(!pq.empty());
     m_Pq_element = pq.top();
-    v0 = m_Pq_element.first;
-    v1 = m_Pq_element.second;
-    v2 = m_Pq_element.third;
-    distance = m_Pq_element.fourth.second;
+    v0 = m_Pq_element.get<0>();
+    v1 = m_Pq_element.get<1>();
+    v2 = m_Pq_element.get<2>();
+    distance = m_Pq_element.get<3>().second;
     pq.pop();
     b0 = m_DT.is_face(v0,v1,v2,fr);
     if (b0){
-      seed_point_ = m_Pq_element.fourth.first;}
+      seed_point_ = m_Pq_element.get<3>().first;}
     b = (!pq.empty());
   }while ((b)&&(!b0));
   Biggest_circle = m_Pq_element;