[Boost-commit] svn:boost r77526 - trunk/boost/graph

Subject: [Boost-commit] svn:boost r77526 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2012-03-25 00:57:50

Author: jewillco
Date: 2012-03-25 00:57:48 EDT (Sun, 25 Mar 2012)
New Revision: 77526
URL: http://svn.boost.org/trac/boost/changeset/77526

Log:
Disambiguated tuple operations
Text files modified: 
   trunk/boost/graph/graphviz.hpp |    19 +++++++++----------                     
   1 files changed, 9 insertions(+), 10 deletions(-)

Modified: trunk/boost/graph/graphviz.hpp
==============================================================================
--- trunk/boost/graph/graphviz.hpp	(original)
+++ trunk/boost/graph/graphviz.hpp	2012-03-25 00:57:48 EDT (Sun, 25 Mar 2012)
@@ -32,7 +32,6 @@
 #include <boost/static_assert.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/xpressive/xpressive_static.hpp>
-#include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 
 namespace boost {
@@ -833,13 +832,13 @@
     BGL_FORALL_EDGES_T(e, temp, TempCSRGraph) {
       edge_permutation_from_sorting[temp[e]] = e;
     }
-    typedef tuple<id_t, bgl_vertex_t, id_t> v_prop;
+    typedef boost::tuple<id_t, bgl_vertex_t, id_t> v_prop;
     BOOST_FOREACH(const v_prop& t, vertex_props) {
-      put(get<0>(t), dp_, get<1>(t), get<2>(t));
+      put(boost::get<0>(t), dp_, boost::get<1>(t), boost::get<2>(t));
     }
-    typedef tuple<id_t, bgl_edge_t, id_t> e_prop;
+    typedef boost::tuple<id_t, bgl_edge_t, id_t> e_prop;
     BOOST_FOREACH(const e_prop& t, edge_props) {
-      put(get<0>(t), dp_, edge_permutation_from_sorting[get<1>(t)], get<2>(t));
+      put(boost::get<0>(t), dp_, edge_permutation_from_sorting[boost::get<1>(t)], boost::get<2>(t));
     }
   }
 
@@ -860,7 +859,7 @@
     bgl_nodes.insert(std::make_pair(node, v));
 
     // node_id_prop_ allows the caller to see the real id names for nodes.
-    vertex_props.push_back(make_tuple(node_id_prop_, v, node));
+    vertex_props.push_back(boost::make_tuple(node_id_prop_, v, node));
   }
 
   void
@@ -874,13 +873,13 @@
   void
   set_node_property(const id_t& key, const node_t& node, const id_t& value)
   {
-    vertex_props.push_back(make_tuple(key, bgl_nodes[node], value));
+    vertex_props.push_back(boost::make_tuple(key, bgl_nodes[node], value));
   }
 
   void
   set_edge_property(const id_t& key, const edge_t& edge, const id_t& value)
   {
-    edge_props.push_back(make_tuple(key, bgl_edges[edge], value));
+    edge_props.push_back(boost::make_tuple(key, bgl_edges[edge], value));
   }
 
   void
@@ -896,8 +895,8 @@
   dynamic_properties& dp_;
   bgl_vertex_t vertex_count;
   std::string node_id_prop_;
-  std::vector<tuple<id_t, bgl_vertex_t, id_t> > vertex_props;
-  std::vector<tuple<id_t, bgl_edge_t, id_t> > edge_props;
+  std::vector<boost::tuple<id_t, bgl_vertex_t, id_t> > vertex_props;
+  std::vector<boost::tuple<id_t, bgl_edge_t, id_t> > edge_props;
   std::vector<std::pair<bgl_vertex_t, bgl_vertex_t> > edges_to_add;
   std::map<node_t, bgl_vertex_t> bgl_nodes;
   std::map<edge_t, bgl_edge_t> bgl_edges;