From 40ffa294a2ebcd667669bdd37f671a4fd2480240 Mon Sep 17 00:00:00 2001
From: Aaron Windsor <aaron.windsor@gmail.com>
Date: Sun, 7 Oct 2007 16:52:39 +0000
Subject: [PATCH] Fixing some errors and warnings on the planar graph tests
 coming from Sun compilers.

[SVN r39763]
---
 include/boost/graph/make_biconnected_planar.hpp      |  5 +++--
 .../boost/graph/planar_detail/boyer_myrvold_impl.hpp | 12 +++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/include/boost/graph/make_biconnected_planar.hpp b/include/boost/graph/make_biconnected_planar.hpp
index 948e3a81..b7daef5a 100644
--- a/include/boost/graph/make_biconnected_planar.hpp
+++ b/include/boost/graph/make_biconnected_planar.hpp
@@ -44,8 +44,9 @@ namespace boost
     typedef iterator_property_map
       <std::vector<std::size_t>::iterator, EdgeIndexMap> component_map_t;
 
+	edge_size_t n_edges(num_edges(g));
     std::vector<vertex_t> articulation_points;
-    std::vector<edge_size_t> component_vector(num_edges(g));
+    std::vector<edge_size_t> component_vector(n_edges);
     component_map_t component_map(component_vector.begin(), em);
 
     biconnected_components(g, component_map, 
@@ -58,7 +59,7 @@ namespace boost
         vertex_t v(*ap);
         embedding_iterator_t pi = embedding[v].begin();
         embedding_iterator_t pi_end = embedding[v].end();
-        edge_size_t previous_component;
+        edge_size_t previous_component(n_edges + 1);
         vertex_t previous_vertex = graph_traits<Graph>::null_vertex();
 
         for(; pi != pi_end; ++pi)
diff --git a/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp b/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp
index adc1eb5c..e9ee4aef 100644
--- a/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp
+++ b/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp
@@ -465,9 +465,7 @@ namespace boost
       // to v. This will set the stage for the walkdown to efficiently
       // traverse the graph of bicomps down from v.
 
-      typedef face_iterator 
-        <Graph, vertex_to_face_handle_map_t, vertex_t, both_sides> 
-        walkup_iterator_t;
+      typedef face_vertex_iterator<both_sides>::type walkup_iterator_t;
       
       out_edge_iterator_t oi, oi_end;
       for(tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi)
@@ -1083,9 +1081,7 @@ namespace boost
               return current_endpoint;
             }
 
-          typedef face_iterator 
-            <Graph, vertex_to_face_handle_map_t, edge_t, single_side> 
-            walkup_itr_t;
+          typedef face_edge_iterator<>::type walkup_itr_t;
           
           walkup_itr_t 
             walkup_itr(current_endpoint, face_handles, first_side());
@@ -1323,9 +1319,7 @@ namespace boost
           bicomp_root = current_vertex;
         }
 
-
-      typedef face_iterator 
-        <Graph, vertex_to_face_handle_map_t, edge_t, single_side> walkup_itr_t;
+      typedef face_edge_iterator<>::type walkup_itr_t;
 
       std::vector<bool> outer_face_edge_vector(num_edges(g), false);
       edge_to_bool_map_t outer_face_edge(outer_face_edge_vector.begin(), em);