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

Subject: [Boost-commit] svn:boost r80569 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2012-09-17 23:27:42

Author: jewillco
Date: 2012-09-17 23:27:42 EDT (Mon, 17 Sep 2012)
New Revision: 80569
URL: http://svn.boost.org/trac/boost/changeset/80569

Log:
Trying to remove unnecessary member accesses (that might not exist) for unused traits
Text files modified: 
   trunk/boost/graph/filtered_graph.hpp |    20 ++++++--------------                    
   1 files changed, 6 insertions(+), 14 deletions(-)

Modified: trunk/boost/graph/filtered_graph.hpp
==============================================================================
--- trunk/boost/graph/filtered_graph.hpp	(original)
+++ trunk/boost/graph/filtered_graph.hpp	2012-09-17 23:27:42 EDT (Mon, 17 Sep 2012)
@@ -195,7 +195,6 @@
 
     typedef filtered_graph_tag graph_tag;
 
-#ifndef BOOST_GRAPH_NO_BUNDLED_PROPERTIES
     // Bundled properties support
     template<typename Descriptor>
     typename graph::detail::bundled_result<Graph, Descriptor>::type&
@@ -206,7 +205,6 @@
     typename graph::detail::bundled_result<Graph, Descriptor>::type const&
     operator[](Descriptor x) const
     { return this->m_g[x]; }
-#endif // BOOST_GRAPH_NO_BUNDLED_PROPERTIES
 
     static vertex_descriptor null_vertex()
     {
@@ -222,26 +220,21 @@
   template <typename Graph, 
             typename EdgePredicate,
             typename VertexPredicate>
-  struct vertex_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> > {
-    typedef typename vertex_property_type<Graph>::type type;
-  };
+  struct vertex_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> >:
+    vertex_property_type<Graph> {};
 
   template <typename Graph, 
             typename EdgePredicate,
             typename VertexPredicate>
-  struct edge_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> > {
-    typedef typename edge_property_type<Graph>::type type;
-  };
+  struct edge_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> >:
+    edge_property_type<Graph> {};
 
   template <typename Graph, 
             typename EdgePredicate,
             typename VertexPredicate>
-  struct graph_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> > {
-    typedef typename graph_property_type<Graph>::type type;
-  };
-
+  struct graph_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> >:
+    graph_property_type<Graph> {};
 
-#ifndef BOOST_GRAPH_NO_BUNDLED_PROPERTIES
   template<typename Graph, typename EdgePredicate, typename VertexPredicate>
   struct vertex_bundle_type<filtered_graph<Graph, EdgePredicate, 
                                            VertexPredicate> > 
@@ -256,7 +249,6 @@
   struct graph_bundle_type<filtered_graph<Graph, EdgePredicate, 
                                           VertexPredicate> > 
     : graph_bundle_type<Graph> { };
-#endif // BOOST_GRAPH_NO_BUNDLED_PROPERTIES
 
   //===========================================================================
   // Non-member functions for the Filtered Edge Graph